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

components/grpc_support/test/quic_test_server.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // 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[];
 
 extern const char kStatusHeader[];
 
 extern const char kHelloBodyValue[];
 extern const char kHelloStatus[];
 
 extern const char kHelloHeaderName[];
 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_