Don't delay creation of system URLRequestContext until first use

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index a1069e3fc04c8ea07c620f8da5dc74739ea3f2bb..325b008672dc1be9582e036b0f69c3bcf4fed8bc 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -37,7 +37,6 @@
 class PrefProxyConfigTracker;
 class PrefService;
 class PrefRegistrySimple;
-class SystemURLRequestContextGetter;
 
 #if defined(OS_ANDROID)
 namespace chrome {
@@ -55,6 +54,10 @@ namespace certificate_transparency {
 class TreeStateTracker;
 }
 
+namespace chrome {
+class TestingIOThreadState;
+}
+
 namespace chrome_browser_net {
 class DnsProbeService;
 }
@@ -269,11 +272,8 @@ class IOThread : public content::BrowserThreadDelegate {
   bool PacHttpsUrlStrippingEnabled() const;
 
  private:
-  // Provide SystemURLRequestContextGetter with access to
-  // InitSystemRequestContext().
-  friend class SystemURLRequestContextGetter;
-
   friend class test::IOThreadPeer;
+  friend class chrome::TestingIOThreadState;
 
   // BrowserThreadDelegate implementation, runs on the IO thread.
   // This handles initialization and destruction of state that must
@@ -281,16 +281,6 @@ class IOThread : public content::BrowserThreadDelegate {
   void Init() override;
   void CleanUp() override;
 
-  // Global state must be initialized on the IO thread, then this
-  // method must be invoked on the UI thread.
-  void InitSystemRequestContext();
-
-  // Lazy initialization of system request context for
-  // SystemURLRequestContextGetter. To be called on IO thread only
-  // after global state has been initialized on the IO thread, and
-  // SystemRequestContext state has been initialized on the UI thread.
-  void InitSystemRequestContextOnIOThread();
-
   void CreateDefaultAuthHandlerFactory();
 
   // Returns an SSLConfigService instance.