Fixing mock test target.

BUILD

@@ -1467,4 +1467,15 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "grpc++_test",
+    public_hdrs = [
+        "include/grpc++/test/mock_stream.h",
+        "include/grpc++/test/server_context_test_spouse.h",
+    ],
+    deps = [
+        ":grpc++",
+    ],
+)
+
 grpc_generate_one_off_targets()

test/cpp/end2end/BUILD

@@ -198,6 +198,7 @@ grpc_cc_test(
         "//:gpr",
         "//:grpc",
         "//:grpc++",
+        "//:grpc++_test",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
         "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",

test/cpp/end2end/mock_test.cc

@@ -59,7 +59,6 @@
 #include <iostream>
 
 using namespace std;
->>>>>>> 45b89fb11ca3cd524787aeba7a1270f744a1256c
 using grpc::testing::EchoRequest;
 using grpc::testing::EchoResponse;
 using grpc::testing::EchoTestService;