Make iOS's IOThread class use URLRequestContextBuilder.

ios/components/io_thread/ios_io_thread.h

 // Copyright 2017 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 IOS_COMPONENTS_IO_THREAD_IOS_IO_THREAD_H_
 #define IOS_COMPONENTS_IO_THREAD_IOS_IO_THREAD_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 11 matching lines @@
 #include "components/prefs/pref_member.h"
 #include "components/ssl_config/ssl_config_service_manager.h"
 #include "ios/web/public/web_thread_delegate.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_network_session.h"
 
 class PrefProxyConfigTracker;
 class PrefService;
 
 namespace net {
-class CTPolicyEnforcer;
-class CertVerifier;
-class ChannelIDService;
-class CookieStore;
-class CTVerifier;
-class HostResolver;
-class HttpAuthHandlerFactory;
-class HttpAuthPreferences;
-class HttpServerProperties;
-class HttpTransactionFactory;
-class HttpUserAgentSettings;
 class NetworkDelegate;
 class ProxyConfigService;
-class ProxyService;
-class SSLConfigService;
-class TransportSecurityState;
 class URLRequestContext;
 class URLRequestContextGetter;
-class URLRequestJobFactory;
 }  // namespace net
 
 namespace net_log {
 class ChromeNetLog;
 }  // namespace net_log
 
 namespace io_thread {
 
 class SystemURLRequestContextGetter;
 
@@ skipping 30 matching lines @@
       explicit SystemRequestContextLeakChecker(Globals* globals);
       ~SystemRequestContextLeakChecker();
 
      private:
       Globals* const globals_;
     };
 
     Globals();
     ~Globals();
 
-    // The "system" NetworkDelegate, used for BrowserState-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::unique_ptr<net::CTVerifier> cert_transparency_verifier;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
-    std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences;
-    std::unique_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
-    std::unique_ptr<net::HttpServerProperties> http_server_properties;
-    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;
-    std::unique_ptr<net::CookieStore> system_cookie_store;
-    std::unique_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
-    std::unique_ptr<net::CTPolicyEnforcer> ct_policy_enforcer;
   };
 
   // |net_log| must either outlive the IOSIOThread or be NULL.
   IOSIOThread(PrefService* local_state, net_log::ChromeNetLog* net_log);
   ~IOSIOThread() override;
 
   // Can only be called on the IO thread.
   Globals* globals();
 
   // Allows overriding Globals in tests where IOSIOThread::Init() and
@@ skipping 33 matching lines @@
   // Provide SystemURLRequestContextGetter with access to
   // InitSystemRequestContext().
   friend class SystemURLRequestContextGetter;
 
   // WebThreadDelegate 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;
 
-  // Sets up HttpAuthPreferences and HttpAuthHandlerFactory on Globals.
-  void CreateDefaultAuthHandlerFactory();
-
   // Returns an SSLConfigService instance.
   net::SSLConfigService* GetSSLConfigService();
 
   // Discards confidental data. To be called on IO thread only.
   void ChangedToOnTheRecordOnIOThread();
 
-  static net::URLRequestContext* ConstructSystemRequestContext(
-      Globals* globals,
-      const net::HttpNetworkSession::Params& params,
-      net::NetLog* net_log);
-
   // The NetLog is owned by the application context, to allow logging from other
   // threads during shutdown, but is used most frequently on the IO thread.
   net_log::ChromeNetLog* net_log_;
 
   // These member variables are basically global, but their lifetimes are tied
   // to the IOSIOThread.  IOSIOThread owns them all, despite not using
   // scoped_ptr. This is because the destructor of IOSIOThread runs on the
   // wrong thread.  All member variables should be deleted in CleanUp().
 
   // These member variables are initialized in Init() and do not change for the
@@ skipping 24 matching lines @@
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOSIOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOSIOThread);
 };
 
 }  // namespace io_thread
 
 #endif  // IOS_COMPONENTS_IO_THREAD_IO_THREAD_H_