Don't delay creation of system URLRequestContext until first use

chrome/browser/io_thread.h

 // Copyright (c) 2012 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 CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 18 matching lines @@
 #include "components/ssl_config/ssl_config_service_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "extensions/features/features.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_network_session.h"
 
 class PrefProxyConfigTracker;
 class PrefService;
 class PrefRegistrySimple;
-class SystemURLRequestContextGetter;
 
 #if defined(OS_ANDROID)
 namespace chrome {
 namespace android {
 class ExternalDataUseObserver;
 }
 }
 #endif  // defined(OS_ANDROID)
 
 namespace base {
 class CommandLine;
 }
 
 namespace certificate_transparency {
 class TreeStateTracker;
 }
 
+namespace chrome {
+class TestingIOThreadState;
+}
+
 namespace chrome_browser_net {
 class DnsProbeService;
 }
 
 namespace data_usage {
 class DataUseAggregator;
 }
 
 namespace data_use_measurement {
 class ChromeDataUseAscriber;
@@ skipping 191 matching lines @@
   // preferences/policy/commandline.
   //
   // For a description of what these features are, and how they are
   // configured, see the comments in pref_names.cc for
   // |kQuickCheckEnabled| and |kPacHttpsUrlStrippingEnabled
   // respectively.
   bool WpadQuickCheckEnabled() const;
   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
   // live on the IO thread.
   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.
   net::SSLConfigService* GetSSLConfigService();
 
   void ChangedToOnTheRecordOnIOThread();
 
   void UpdateDnsClientEnabled();
   void UpdateServerWhitelist();
   void UpdateDelegateWhitelist();
@@ skipping 104 matching lines @@
   bool http_09_on_non_default_ports_enabled_;
 
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_