Wrap ParseCommandLineFlags in InitTest

1 files changed, 2 insertions, 8 deletions

diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc
index d87493b813..94e266fcbd 100644
--- a/test/cpp/interop/server.cc
+++ b/test/cpp/interop/server.cc
@@ -52,6 +52,7 @@
 #include "test/cpp/interop/empty.grpc.pb.h"
 #include "test/cpp/interop/messages.grpc.pb.h"
 #include "test/cpp/interop/server_helper.h"
+#include "test/cpp/util/test_config.h"
 
 DEFINE_bool(enable_ssl, false, "Whether to use ssl/tls.");
 DEFINE_int32(port, 0, "Server port.");
@@ -75,13 +76,6 @@ using grpc::testing::StreamingOutputCallResponse;
 using grpc::testing::TestService;
 using grpc::Status;
 
-// In some distros, gflags is in the namespace google, and in some others,
-// in gflags. This hack is enabling us to find both.
-namespace google {}
-namespace gflags {}
-using namespace google;
-using namespace gflags;
-
 static bool got_sigint = false;
 
 bool SetPayload(PayloadType type, int size, Payload* payload) {
@@ -225,7 +219,7 @@ static void sigint_handler(int x) { got_sigint = true; }
 
 int main(int argc, char** argv) {
   grpc_init();
-  ParseCommandLineFlags(&argc, &argv, true);
+  grpc::testing::InitTest(&argc, &argv, true);
   signal(SIGINT, sigint_handler);
 
   GPR_ASSERT(FLAGS_port != 0);