[cronet] Add mechanism for restarting CronetEnvironment

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/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 Cronet (ExposedForTesting)

[mef, 2017/04/27 14:58:20]

I wonder whether it makes sense to create a header like
Cronet+ExposedForTesting.h and move declaration of all *ForTesting methods into
it?

[lilyhoughton, 2017/05/01 15:31:35]

I like this idea a lot.  It probably makes sense as a separate CL, though (esp.
since it's going to involve a bit of restructuring of things).

[mef, 2017/05/01 19:12:58]

sgtm

++ (void)shutdownForTesting;
+@end
+
 @interface TestDelegate : NSObject<NSURLSessionDataDelegate,
                                    NSURLSessionDelegate,
                                    NSURLSessionTaskDelegate>
 
 // Completion semaphore for this TestDelegate. When the request this delegate is
 // attached to finishes (either successfully or with an error), this delegate
 // signals this semaphore.
 @property(assign, atomic) dispatch_semaphore_t semaphore;
 
 // Error the request this delegate is attached to failed with, if any.
@@ skipping 99 matching lines @@
   HttpTest() {}
   ~HttpTest() override {}
 
   void SetUp() override {
     grpc_support::StartQuicTestServer();
     TestServer::Start();
 
     [Cronet setRequestFilterBlock:^(NSURLRequest* request) {
       return YES;
     }];
-    StartCronetIfNecessary(grpc_support::GetQuicTestServerPort());
+    StartCronet(grpc_support::GetQuicTestServerPort());
     [Cronet registerHttpProtocolHandler];
     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]);
   }
 
   void TearDown() override {
     grpc_support::ShutdownQuicTestServer();
     TestServer::Shutdown();
+
+    [Cronet stopNetLog];
+    [Cronet shutdownForTesting];
   }
 
   // Launches the supplied |task| and blocks until it completes, with a timeout
   // of 1 second.
   void StartDataTaskAndWaitForCompletion(NSURLSessionDataTask* task) {
     [delegate_ reset];
     [task resume];
     int64_t deadline_ns = 20 * ns_in_second;
     ASSERT_EQ(0, dispatch_semaphore_wait(
                      [delegate_ semaphore],
@@ skipping 281 matching lines @@
   [Cronet setRequestFilterBlock:^(NSURLRequest* request) {
     EXPECT_TRUE(false) << "Block should not be called for unsupported requests";
     return YES;
   }];
   StartDataTaskAndWaitForCompletion(task);
   EXPECT_EQ(nil, [delegate_ error]);
   EXPECT_TRUE([[delegate_ responseBody] containsString:testString]);
 }
 
 }  // namespace cronet