Move more SystemURLRequestContext members into its ContextStorage

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 4f2db705cfc8920c71c358b0c96eff7e1c4bc07a..d8b4ba86c33c04d26b7feeb21be2cb499914fb21 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -75,10 +75,9 @@ class EventRouterForwarder;
 }
 
 namespace net {
-class CertVerifier;
 class CTLogVerifier;
 class HostMappingRules;
-class HostResolver;
+class HttpAuthHandlerRegistryFactory;
 class HttpAuthPreferences;
 class LoggingNetworkChangeObserver;
 class NetworkQualityEstimator;
@@ -138,11 +137,7 @@ class IOThread : public content::BrowserThreadDelegate {
     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;
@@ -240,7 +235,8 @@ class IOThread : public content::BrowserThreadDelegate {
   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();