fix conflicts

.gitmodules

@@ -1,16 +1,9 @@
 [submodule "third_party/zlib"]
 	path = third_party/zlib
 	url = https://github.com/madler/zlib
-[submodule "third_party/protobuf"]
-	path = third_party/protobuf
-	url = https://github.com/google/protobuf.git
-	branch = 3.0.x
 [submodule "third_party/gflags"]
 	path = third_party/gflags
 	url = https://github.com/gflags/gflags.git
-[submodule "third_party/googletest"]
-	path = third_party/googletest
-	url = https://github.com/google/googletest.git
 [submodule "third_party/boringssl"]
 	path = third_party/boringssl
 	url = https://github.com/google/boringssl.git

src/compiler/cpp_generator.h

@@ -111,6 +111,18 @@ grpc::string GetMockServices(File* file, const Parameters &params);
 // Return the epilogue of generated mock file.
 grpc::string GetMockEpilogue(File* file, const Parameters &params);
 
+// Return the prologue of the generated mock file.
+grpc::string GetMockPrologue(File *file, const Parameters &params);
+
+// Return the includes needed for generated mock file.
+grpc::string GetMockIncludes(File *file, const Parameters &params);
+
+// Return the services for generated mock file.
+grpc::string GetMockServices(File* file, const Parameters &params);
+
+// Return the epilogue of generated mock file.
+grpc::string GetMockEpilogue(File* file, const Parameters &params);
+
 }  // namespace grpc_cpp_generator
 
 #endif  // GRPC_INTERNAL_COMPILER_CPP_GENERATOR_H

third_party/googletest

@@ -1 +0,0 @@
-Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780

third_party/protobuf

@@ -1 +0,0 @@
-Subproject commit 4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182