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

components/cronet/ios/test/cronet_http_test.mm

 // Copyright 2015 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.
 
 #import <Cronet/Cronet.h>
 #import <Foundation/Foundation.h>
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
-#include "components/cronet/ios/test/quic_test_server.h"
+#include "components/cronet/ios/test/start_cronet.h"
 #include "components/cronet/ios/test/test_server.h"
+#include "components/grpc_support/test/quic_test_server.h"
 #include "net/base/mac/url_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 
 #include "url/gurl.h"
 
 @interface TestDelegate : NSObject<NSURLSessionDataDelegate,
                                    NSURLSessionDelegate,
@@ skipping 80 matching lines @@
 }
 
 @end
 
 namespace cronet {
 // base::TimeDelta would normally be ideal for this but it does not support
 // nanosecond resolution.
 static const int64_t ns_in_second = 1000000000LL;
 const char kUserAgent[] = "CronetTest/1.0.0.0";
 
-// TODO(mef): Create common header file to declare this.
-void StartCronetIfNecessary();
-
 class HttpTest : public ::testing::Test {
  protected:
   HttpTest() {}
   ~HttpTest() override {}
 
   void SetUp() override {
-    StartCronetIfNecessary();
+    grpc_support::StartQuicTestServer();
+    TestServer::Start();
+
+    StartCronetIfNecessary(grpc_support::GetQuicTestServerPort());
     NSURLSessionConfiguration* config =
         [NSURLSessionConfiguration ephemeralSessionConfiguration];
     [Cronet installIntoSessionConfiguration:config];
     delegate_.reset([[TestDelegate alloc] init]);
     NSURLSession* session = [NSURLSession sessionWithConfiguration:config
                                                           delegate:delegate_
                                                      delegateQueue:nil];
     // Take a reference to the session and store it so it doesn't get
     // deallocated until this object does.
     session_.reset([session retain]);
-    StartQuicTestServer();
-    TestServer::Start();
   }
 
   void TearDown() override {
-    ShutdownQuicTestServer();
+    grpc_support::ShutdownQuicTestServer();
     TestServer::Shutdown();
   }
 
   // Launches the supplied |task| and blocks until it completes, with a timeout
   // of 1 second.
   void StartDataTaskAndWaitForCompletion(NSURLSessionDataTask* task) {
     [task resume];
     int64_t deadline_ns = 1 * ns_in_second;
     dispatch_semaphore_wait([delegate_ semaphore],
                             dispatch_time(DISPATCH_TIME_NOW, deadline_ns));
   }
 
   base::scoped_nsobject<NSURLSession> session_;
   base::scoped_nsobject<TestDelegate> delegate_;
 };
 
 TEST_F(HttpTest, NSURLSessionReceivesData) {
-  NSURL* url = net::NSURLWithGURL(GURL(kTestServerUrl));
+  NSURL* url = net::NSURLWithGURL(GURL(grpc_support::kTestServerUrl));
   NSURLSessionDataTask* task = [session_ dataTaskWithURL:url];
   StartDataTaskAndWaitForCompletion(task);
   EXPECT_EQ(nil, [delegate_ error]);
-  EXPECT_STREQ(kHelloBodyValue, [[delegate_ responseBody] UTF8String]);
+  EXPECT_STREQ(grpc_support::kHelloBodyValue,
+               base::SysNSStringToUTF8([delegate_ responseBody]).c_str());
 }
 
 TEST_F(HttpTest, GetGlobalMetricsDeltas) {
   NSData* delta1 = [Cronet getGlobalMetricsDeltas];
 
-  NSURL* url = net::NSURLWithGURL(GURL(kTestServerUrl));
+  NSURL* url = net::NSURLWithGURL(GURL(grpc_support::kTestServerUrl));
   NSURLSessionDataTask* task = [session_ dataTaskWithURL:url];
   StartDataTaskAndWaitForCompletion(task);
   EXPECT_EQ(nil, [delegate_ error]);
-  EXPECT_STREQ(kHelloBodyValue, [[delegate_ responseBody] UTF8String]);
+  EXPECT_STREQ(grpc_support::kHelloBodyValue,
+               base::SysNSStringToUTF8([delegate_ responseBody]).c_str());
 
   NSData* delta2 = [Cronet getGlobalMetricsDeltas];
   EXPECT_FALSE([delta2 isEqualToData:delta1]);
 }
 
 TEST_F(HttpTest, SdchDisabledByDefault) {
   NSURL* url =
       net::NSURLWithGURL(GURL(TestServer::GetEchoHeaderURL("Accept-Encoding")));
   NSURLSessionDataTask* task = [session_ dataTaskWithURL:url];
   StartDataTaskAndWaitForCompletion(task);
@@ skipping 13 matching lines @@
 TEST_F(HttpTest, SetUserAgentIsExact) {
   NSURL* url =
       net::NSURLWithGURL(GURL(TestServer::GetEchoHeaderURL("User-Agent")));
   NSURLSessionDataTask* task = [session_ dataTaskWithURL:url];
   StartDataTaskAndWaitForCompletion(task);
   EXPECT_EQ(nil, [delegate_ error]);
   EXPECT_STREQ(kUserAgent, [[delegate_ responseBody] UTF8String]);
 }
 
 }  // namespace cronet