Restore calls to set cert fetcher on some platforms.

chrome/browser/io_thread.cc

 // 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.
 
 #include "chrome/browser/io_thread.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 163 matching lines @@
   std::string path_str;
   env->GetVar("SSLKEYLOGFILE", &path_str);
 #if defined(OS_WIN)
   // base::Environment returns environment variables in UTF-8 on Windows.
   return base::FilePath(base::UTF8ToUTF16(path_str));
 #else
   return base::FilePath(path_str);
 #endif
 }
 
-// Used for the "system" URLRequestContext.
-class SystemURLRequestContext : public net::URLRequestContext {
- public:
-  SystemURLRequestContext() {
-#if defined(USE_NSS_CERTS)
-    net::SetURLRequestContextForNSSHttpIO(this);
-#endif
-#if defined(OS_ANDROID)
-    net::CertVerifyProcAndroid::SetCertNetFetcher(
-        net::CreateCertNetFetcher(this));
-#endif
-  }
-
-  ~SystemURLRequestContext() override {
-    AssertNoURLRequests();
-#if defined(USE_NSS_CERTS)
-    net::SetURLRequestContextForNSSHttpIO(NULL);
-#endif
-
-#if defined(OS_ANDROID)
-    net::CertVerifyProcAndroid::ShutdownCertNetFetcher();
-#endif
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SystemURLRequestContext);
-};
-
 std::unique_ptr<net::HostResolver> CreateGlobalHostResolver(
     net::NetLog* net_log) {
   TRACE_EVENT0("startup", "IOThread::CreateGlobalHostResolver");
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   net::HostResolver::Options options;
   std::unique_ptr<net::HostResolver> global_host_resolver;
 #if defined OS_CHROMEOS
   global_host_resolver =
@@ skipping 415 matching lines @@
   if (globals()->system_request_context) {
     globals()
         ->system_request_context->cert_transparency_verifier()
         ->SetObserver(nullptr);
   }
   if (ct_tree_tracker_.get()) {
     UnregisterSTHObserver(ct_tree_tracker_.get());
     ct_tree_tracker_.reset();
   }
 
-  if (globals_->system_request_context)
+  if (globals_->system_request_context) {
     globals_->system_request_context->proxy_service()->OnShutdown();
 
+#if defined(USE_NSS_CERTS)
+    net::SetURLRequestContextForNSSHttpIO(nullptr);
+#endif
+
+#if defined(OS_ANDROID)
+    net::CertVerifyProcAndroid::ShutdownCertNetFetcher();
+#endif
+  }
+
   // Release objects that the net::URLRequestContext could have been pointing
   // to.
 
   // Shutdown the HistogramWatcher on the IO thread.
   net::NetworkChangeNotifier::ShutdownHistogramWatcher();
 
   // This must be reset before the ChromeNetLog is destroyed.
   network_change_observer_.reset();
 
   system_proxy_config_service_.reset();
@@ skipping 220 matching lines @@
 
   builder.set_data_enabled(true);
   builder.set_file_enabled(true);
 #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
   builder.set_ftp_enabled(true);
 #endif
 
   builder.DisableHttpCache();
 
   globals_->system_request_context = builder.Build();
+
+#if defined(USE_NSS_CERTS)
+  net::SetURLRequestContextForNSSHttpIO(globals_->system_request_context.get());
+#endif
+#if defined(OS_ANDROID)
+  net::CertVerifyProcAndroid::SetCertNetFetcher(
+      net::CreateCertNetFetcher(globals_->system_request_context.get()));
+#endif
 }
 
 // static
 void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine(
     const base::CommandLine& command_line,
     bool is_quic_allowed_by_policy,
     bool http_09_on_non_default_ports_enabled,
     net::HttpNetworkSession::Params* params) {
   std::string quic_user_agent_id = chrome::GetChannelString();
   if (!quic_user_agent_id.empty())
     quic_user_agent_id.push_back(' ');
   quic_user_agent_id.append(
       version_info::GetProductNameAndVersionForUserAgent());
   quic_user_agent_id.push_back(' ');
   quic_user_agent_id.append(content::BuildOSCpuInfo());
 
   network_session_configurator::ParseCommandLineAndFieldTrials(
       command_line, !is_quic_allowed_by_policy, quic_user_agent_id, params);
 
   if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests))
     net::URLFetcher::SetIgnoreCertificateRequests(true);
 
   params->http_09_on_non_default_ports_enabled =
       http_09_on_non_default_ports_enabled;
 }
 
 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() {
   return base::Bind(&UpdateMetricsUsagePrefsOnUIThread);
 }