Third try at landing gRPC refactoring. Previous issue failed on the waterfall

components/grpc_support/test/quic_test_server.h

Index: components/grpc_support/test/quic_test_server.h
diff --git a/components/cronet/ios/test/quic_test_server.h b/components/grpc_support/test/quic_test_server.h
similarity index 73%
rename from components/cronet/ios/test/quic_test_server.h
rename to components/grpc_support/test/quic_test_server.h
index 8b21cb280045c7f22440ab732e592dc73bdef4a6..06ff549a9c8bbd8daf71e2bff40152d0c20e8e3c 100644
--- a/components/cronet/ios/test/quic_test_server.h
+++ b/components/grpc_support/test/quic_test_server.h
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_CRONET_IOS_TEST_QUIC_TEST_SERVER_H_
-#define COMPONENTS_CRONET_IOS_TEST_QUIC_TEST_SERVER_H_
+#ifndef COMPONENTS_GRPC_SUPPORT_TEST_QUIC_TEST_SERVER_H_
+#define COMPONENTS_GRPC_SUPPORT_TEST_QUIC_TEST_SERVER_H_
 
-namespace cronet {
+#include <string>
+
+namespace grpc_support {
 
 bool StartQuicTestServer();
 
 void ShutdownQuicTestServer();
 
-extern const char kTestServerDomain[];
-extern const int kTestServerPort;
+int GetQuicTestServerPort();
+
 extern const char kTestServerHost[];
 extern const char kTestServerUrl[];
 
@@ -27,6 +29,6 @@ extern const char kHelloHeaderValue[];
 extern const char kHelloTrailerName[];
 extern const char kHelloTrailerValue[];
 
-}  // namespace cronet
+}  // namespace grpc_support
 
 #endif  // COMPONENTS_CRONET_IOS_TEST_QUIC_TEST_SERVER_H_