Move more SystemURLRequestContext members into its ContextStorage

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 57 matching lines @@
 
 namespace data_use_measurement {
 class ChromeDataUseAscriber;
 }
 
 namespace extensions {
 class EventRouterForwarder;
 }
 
 namespace net {
-class CertVerifier;
 class CTLogVerifier;
 class HostMappingRules;
-class HostResolver;
+class HttpAuthHandlerRegistryFactory;
 class HttpAuthPreferences;
 class LoggingNetworkChangeObserver;
 class NetworkQualityEstimator;
 class ProxyConfigService;
 class SSLConfigService;
 class URLRequestContext;
 class URLRequestContextGetter;
 class URLRequestContextStorage;
 
 namespace ct {
@@ skipping 39 matching lines @@
     std::unique_ptr<data_use_measurement::ChromeDataUseAscriber>
         data_use_ascriber;
     // Global aggregator of data use. It must outlive the
     // |system_network_delegate|.
     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)
-    std::unique_ptr<net::HostResolver> host_resolver;
-    std::unique_ptr<net::CertVerifier> cert_verifier;
     std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs;
-    std::unique_ptr<net::CTVerifier> cert_transparency_verifier;
-    std::unique_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
     std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences;
     std::unique_ptr<net::URLRequestContextStorage>
         system_request_context_storage;
     std::unique_ptr<net::URLRequestContext> system_request_context;
     SystemRequestContextLeakChecker system_request_context_leak_checker;
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     scoped_refptr<extensions::EventRouterForwarder>
         extension_event_router_forwarder;
 #endif
     std::unique_ptr<net::HostMappingRules> host_mapping_rules;
@@ skipping 77 matching lines @@
  private:
   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;
 
-  void CreateDefaultAuthHandlerFactory();
+  std::unique_ptr<net::HttpAuthHandlerRegistryFactory>

[Randy Smith (Not in Mondays), 2017/06/07 19:28:17]

Why change to the subclass type instead of just sticking with
HttpAuthHandlerFactory?  (Don't care, just curious.)

[mmenke, 2017/06/07 21:06:03]

Just because an "HttpAuthHandlerRegistryFactory" is not clearly an
"HttpAuthHandlerFactory" (It sounds like it creates HttpAuthHandlerRegistries),
and I thought this made it a little clearer it was, though it's certainly
debatable.  Anyhow, don't have strong opinion here, so I changed it.

+  CreateDefaultAuthHandlerFactory();
 
   // Returns an SSLConfigService instance.
   net::SSLConfigService* GetSSLConfigService();
 
   void ChangedToOnTheRecordOnIOThread();
 
   void UpdateDnsClientEnabled();
   void UpdateServerWhitelist();
   void UpdateDelegateWhitelist();
   void UpdateAndroidAuthNegotiateAccountType();
@@ skipping 96 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_