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

components/cronet/ios/Cronet.mm

 // 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.
 
 #import "components/cronet/ios/Cronet.h"
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 BOOL gHttp2Enabled = YES;
 BOOL gQuicEnabled = NO;
 ScopedVector<cronet::URLRequestContextConfig::QuicHint> gQuicHints;
 NSString* gUserAgent = nil;
 BOOL gUserAgentPartial = NO;
 NSString* gSslKeyLogFileName = nil;
 RequestFilterBlock gRequestFilterBlock = nil;
 std::unique_ptr<CronetHttpProtocolHandlerDelegate> gHttpProtocolHandlerDelegate;
 NSURLCache* gPreservedSharedURLCache = nil;
 BOOL gEnableTestCertVerifierForTesting = FALSE;
-NSString* gHostResolverRulesForTesting = @"";
 
 // CertVerifier, which allows any certificates for testing.
 class TestCertVerifier : public net::CertVerifier {
   int Verify(const RequestParams& params,
              net::CRLSet* crl_set,
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
              std::unique_ptr<Request>* out_req,
              const net::NetLogWithSource& net_log) override {
     net::Error result = net::OK;
@@ skipping 44 matching lines @@
   base::mac::ScopedBlock<RequestFilterBlock> filter_;
   base::Lock lock_;
 };
 
 }  // namespace
 
 @implementation Cronet
 
 + (void)configureCronetEnvironmentForTesting:
     (cronet::CronetEnvironment*)cronetEnvironment {
-  cronetEnvironment->set_host_resolver_rules(
-      [gHostResolverRulesForTesting UTF8String]);
   if (gEnableTestCertVerifierForTesting) {
     std::unique_ptr<TestCertVerifier> test_cert_verifier =
         base::MakeUnique<TestCertVerifier>();
     cronetEnvironment->set_cert_verifier(std::move(test_cert_verifier));
   }
 }
 
 + (NSString*)getAcceptLanguages {
   // Use the framework bundle to search for resources.
   NSBundle* frameworkBundle = [NSBundle bundleForClass:self];
@@ skipping 126 matching lines @@
 
 + (NSString*)getUserAgent {
   if (!gChromeNet.Get().get()) {
     return nil;
   }
 
   return [NSString stringWithCString:gChromeNet.Get()->user_agent().c_str()
                             encoding:[NSString defaultCStringEncoding]];
 }
 
-+ (cronet_engine*)getGlobalEngine {
++ (stream_engine*)getGlobalEngine {
   DCHECK(gChromeNet.Get().get());
   if (gChromeNet.Get().get()) {
-    static cronet_engine engine;
-    engine.obj = gChromeNet.Get().get();
+    static stream_engine engine;
+    engine.obj = gChromeNet.Get()->GetURLRequestContextGetter();
     return &engine;
   }
   return nil;
 }
 
 + (NSData*)getGlobalMetricsDeltas {
   if (!gChromeNet.Get().get()) {
     return nil;
   }
   std::vector<uint8_t> deltas(gChromeNet.Get()->GetHistogramDeltas());
   return [NSData dataWithBytes:deltas.data() length:deltas.size()];
 }
 
 + (void)enableTestCertVerifierForTesting {
   gEnableTestCertVerifierForTesting = YES;
 }
 
 + (void)setHostResolverRulesForTesting:(NSString*)hostResolverRulesForTesting {
-  gHostResolverRulesForTesting = hostResolverRulesForTesting;
+  DCHECK(gChromeNet.Get().get());
+  gChromeNet.Get()->SetHostResolverRules(
+      base::SysNSStringToUTF8(hostResolverRulesForTesting));
 }
 
 // This is a non-public dummy method that prevents the linker from stripping out
-// the otherwise non-referenced methods from 'cronet_bidirectional_stream.cc'.
+// the otherwise non-referenced methods from 'bidirectional_stream.cc'.
 + (void)preventStrippingCronetBidirectionalStream {
-  cronet_bidirectional_stream_create(NULL, 0, 0);
+  bidirectional_stream_create(NULL, 0, 0);
 }
 
 @end