Revert https://codereview.chromium.org/2860033003

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 19 matching lines @@
 #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"
 #include "net/nqe/network_quality_estimator.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;
 }
 
 namespace extensions {
 class EventRouterForwarder;
 }
 
 namespace net {
 class CTPolicyEnforcer;
 class CertVerifier;
+class ChannelIDService;
+class CookieStore;
 class CTLogVerifier;
 class HostMappingRules;
 class HostResolver;
 class HttpAuthPreferences;
 class HttpServerProperties;
 class HttpTransactionFactory;
 class HttpUserAgentSettings;
 class LoggingNetworkChangeObserver;
 class NetworkDelegate;
 class NetworkQualityEstimator;
 class ProxyConfigService;
 class ProxyService;
 class SSLConfigService;
 class TransportSecurityState;
 class URLRequestContext;
 class URLRequestContextGetter;
-class URLRequestContextStorage;
 class URLRequestJobFactory;
 
 namespace ct {
 class STHObserver;
 }
 
 }  // namespace net
 
 namespace net_log {
 class ChromeNetLog;
@@ skipping 36 matching lines @@
     std::unique_ptr<data_usage::DataUseAggregator> data_use_aggregator;
 #if defined(OS_ANDROID)
     // An external observer of data use.
     std::unique_ptr<chrome::android::ExternalDataUseObserver>
         external_data_use_observer;
 #endif  // defined(OS_ANDROID)
     // The "system" NetworkDelegate, used for Profile-agnostic network events.
     std::unique_ptr<net::NetworkDelegate> system_network_delegate;
     std::unique_ptr<net::HostResolver> host_resolver;
     std::unique_ptr<net::CertVerifier> cert_verifier;
+    // The ChannelIDService must outlive the HttpTransactionFactory.
+    std::unique_ptr<net::ChannelIDService> system_channel_id_service;
     // This TransportSecurityState doesn't load or save any state. It's only
     // used to enforce pinning for system requests and will only use built-in
     // pins.
     std::unique_ptr<net::TransportSecurityState> transport_security_state;
     std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs;
     std::unique_ptr<net::CTVerifier> cert_transparency_verifier;
     std::unique_ptr<net::CTPolicyEnforcer> ct_policy_enforcer;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     std::unique_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
     std::unique_ptr<net::HttpServerProperties> http_server_properties;
     std::unique_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
     std::unique_ptr<net::HttpNetworkSession>
         proxy_script_fetcher_http_network_session;
     std::unique_ptr<net::HttpTransactionFactory>
         proxy_script_fetcher_http_transaction_factory;
     std::unique_ptr<net::URLRequestJobFactory>
         proxy_script_fetcher_url_request_job_factory;
     std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences;
     // TODO(willchan): Remove proxy script fetcher context since it's not
     // necessary now that I got rid of refcounting URLRequestContexts.
     //
     // The first URLRequestContext is |system_url_request_context|. We introduce
     // |proxy_script_fetcher_context| for the second context. It has a direct
     // ProxyService, since we always directly connect to fetch the PAC script.
     std::unique_ptr<net::URLRequestContext> proxy_script_fetcher_context;
-    std::unique_ptr<net::URLRequestContextStorage>
-        system_request_context_storage;
+    std::unique_ptr<net::ProxyService> system_proxy_service;
+    std::unique_ptr<net::HttpNetworkSession> system_http_network_session;
+    std::unique_ptr<net::HttpTransactionFactory>
+        system_http_transaction_factory;
+    std::unique_ptr<net::URLRequestJobFactory> system_url_request_job_factory;
     std::unique_ptr<net::URLRequestContext> system_request_context;
     SystemRequestContextLeakChecker system_request_context_leak_checker;
+    // |system_cookie_store| and |system_channel_id_service| are shared
+    // between |proxy_script_fetcher_context| and |system_request_context|.
+    std::unique_ptr<net::CookieStore> system_cookie_store;
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     scoped_refptr<extensions::EventRouterForwarder>
         extension_event_router_forwarder;
 #endif
     std::unique_ptr<net::HostMappingRules> host_mapping_rules;
     std::unique_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
     std::unique_ptr<net::NetworkQualityEstimator> network_quality_estimator;
     std::unique_ptr<
         net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver>
         network_quality_observer;
@@ skipping 64 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();
   void UpdateAndroidAuthNegotiateAccountType();
   void UpdateNegotiateDisableCnameLookup();
   void UpdateNegotiateEnablePort();
 
   extensions::EventRouterForwarder* extension_event_router_forwarder() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     return extension_event_router_forwarder_;
 #else
     return NULL;
 #endif
   }
-  void ConstructSystemRequestContext();
+  static net::URLRequestContext* ConstructSystemRequestContext(
+      IOThread::Globals* globals,
+      const net::HttpNetworkSession::Params& params,
+      net::NetLog* net_log);
 
   // Parse command line flags and use components/network_session_configurator to
   // configure |params|.
   static void ConfigureParamsFromFieldTrialsAndCommandLine(
       const base::CommandLine& command_line,
       bool is_quic_allowed_by_policy,
       bool http_09_on_non_default_ports_enabled,
       net::HttpNetworkSession::Params* params);
 
   // TODO(willchan): Remove proxy script fetcher context since it's not
@@ skipping 83 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_