Revert of Allow use of Mojo/V8 ProxyResolvers with URLRequestContextBuilder.

net/url_request/url_request_context_builder.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 "net/url_request/url_request_context_builder.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 115 matching lines @@
 
   bool OnCanAccessFile(const URLRequest& request,
                        const base::FilePath& path) const override {
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(BasicNetworkDelegate);
 };
 
 // Define a context class that can self-manage the ownership of its components
-// via a UrlRequestContextStorage object. Since it cancels requests in its
-// destructor, it's not safe to subclass this.
-class ContainerURLRequestContext final : public URLRequestContext {
+// via a UrlRequestContextStorage object.
+class ContainerURLRequestContext : public URLRequestContext {
  public:
   explicit ContainerURLRequestContext(
       const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner)
       : file_task_runner_(file_task_runner), storage_(this) {}
-
-  ~ContainerURLRequestContext() override {
-    // Shut down the ProxyService, as it may have pending URLRequests using this
-    // context. Since this cancels requests, it's not safe to subclass this, as
-    // some parts of the URLRequestContext may then be torn down before this
-    // cancels the ProxyService's URLRequests.
-    proxy_service()->OnShutdown();
-
-    AssertNoURLRequests();
-  }
+  ~ContainerURLRequestContext() override { AssertNoURLRequests(); }
 
   URLRequestContextStorage* storage() {
     return &storage_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner>& GetFileTaskRunner() {
     // Create a new thread to run file tasks, if needed.
     if (!file_task_runner_) {
       DCHECK(!file_thread_);
       file_thread_.reset(new base::Thread("Network File Thread"));
@@ skipping 198 matching lines @@
     context->set_net_log(net_log_);
   } else {
     storage->set_net_log(base::WrapUnique(new NetLog));
   }
 
   if (!host_resolver_) {
     host_resolver_ = HostResolver::CreateDefaultResolver(context->net_log());
   }
   storage->set_host_resolver(std::move(host_resolver_));
 
+  if (!proxy_service_) {
+    // TODO(willchan): Switch to using this code when
+    // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
+#if !defined(OS_LINUX) && !defined(OS_ANDROID)
+    if (!proxy_config_service_) {
+      proxy_config_service_ = ProxyService::CreateSystemProxyConfigService(
+          base::ThreadTaskRunnerHandle::Get().get(),
+          context->GetFileTaskRunner());
+    }
+#endif  // !defined(OS_LINUX) && !defined(OS_ANDROID)
+    proxy_service_ = ProxyService::CreateUsingSystemProxyResolver(
+        std::move(proxy_config_service_),
+        context->net_log());
+  }
+  storage->set_proxy_service(std::move(proxy_service_));
+
   storage->set_ssl_config_service(new SSLConfigServiceDefaults);
 
   if (!http_auth_handler_factory_) {
     http_auth_handler_factory_ =
         HttpAuthHandlerRegistryFactory::CreateDefault(context->host_resolver());
   }
 
   storage->set_http_auth_handler_factory(std::move(http_auth_handler_factory_));
 
   if (cookie_store_set_by_client_) {
@@ skipping 46 matching lines @@
     ct_verifier->AddLogs(ct::CreateLogVerifiersForKnownLogs());
     storage->set_cert_transparency_verifier(std::move(ct_verifier));
   }
   storage->set_ct_policy_enforcer(base::MakeUnique<CTPolicyEnforcer>());
 
   if (throttling_enabled_) {
     storage->set_throttler_manager(
         base::MakeUnique<URLRequestThrottlerManager>());
   }
 
-  if (!proxy_service_) {
-#if !defined(OS_LINUX) && !defined(OS_ANDROID)
-    // TODO(willchan): Switch to using this code when
-    // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
-    if (!proxy_config_service_) {
-      proxy_config_service_ = ProxyService::CreateSystemProxyConfigService(
-          base::ThreadTaskRunnerHandle::Get().get(),
-          context->GetFileTaskRunner());
-    }
-#endif  // !defined(OS_LINUX) && !defined(OS_ANDROID)
-    proxy_service_ =
-        CreateProxyService(std::move(proxy_config_service_), context.get(),
-                           context->host_resolver(),
-                           context->network_delegate(), context->net_log());
-  }
-  storage->set_proxy_service(std::move(proxy_service_));
-
   HttpNetworkSession::Params network_session_params;
   SetHttpNetworkSessionComponents(context.get(), &network_session_params);
   http_network_session_params_.ConfigureSessionParams(&network_session_params);
 
   if (proxy_delegate_) {
     network_session_params.proxy_delegate = proxy_delegate_.get();
     storage->set_proxy_delegate(std::move(proxy_delegate_));
   }
   if (socket_performance_watcher_factory_) {
     network_session_params.socket_performance_watcher_factory =
@@ skipping 65 matching lines @@
           std::move(top_job_factory), std::move(*i)));
     }
     url_request_interceptors_.clear();
   }
   storage->set_job_factory(std::move(top_job_factory));
   // TODO(willchan): Support sdch.
 
   return std::move(context);
 }
 
-std::unique_ptr<ProxyService> URLRequestContextBuilder::CreateProxyService(
-    std::unique_ptr<ProxyConfigService> proxy_config_service,
-    URLRequestContext* url_request_context,
-    HostResolver* host_resolver,
-    NetworkDelegate* network_delegate,
-    NetLog* net_log) {
-  return ProxyService::CreateUsingSystemProxyResolver(
-      std::move(proxy_config_service), net_log);
-}
-
 }  // namespace net