From a55d60056bbc833f9607ff448a810dc8766aca85 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Fri, 26 Oct 2018 17:16:17 -0700
Subject: Fix build

---
 test/cpp/end2end/interceptors_util.h | 5 ++---
 test/cpp/interop/client_helper.h     | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h
index a481ccc517..5f0aa37dc0 100644
--- a/test/cpp/end2end/interceptors_util.h
+++ b/test/cpp/end2end/interceptors_util.h
@@ -175,10 +175,9 @@ void MakeCallbackCall(const std::shared_ptr<Channel>& channel) {
 }
 
 bool CheckMetadata(const std::multimap<grpc::string_ref, grpc::string_ref>& map,
-                   string key, string value) {
+                   const string& key, const string& value) {
   for (const auto& pair : map) {
-    if (pair.first.starts_with("testkey") &&
-        pair.second.starts_with("testvalue")) {
+    if (pair.first.starts_with(key) && pair.second.starts_with(value)) {
       return true;
     }
   }
diff --git a/test/cpp/interop/client_helper.h b/test/cpp/interop/client_helper.h
index eada2f671f..7dee85cc98 100644
--- a/test/cpp/interop/client_helper.h
+++ b/test/cpp/interop/client_helper.h
@@ -19,10 +19,12 @@
 #ifndef GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H
 #define GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H
 
+#include <functional>
 #include <memory>
 #include <unordered_map>
 
 #include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
 
 #include "src/core/lib/surface/call_test_only.h"
 
-- 
cgit v1.2.3