Make URLRequestContextBuilderV8 Mojo-only.

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 190 matching lines @@
       file_enabled_(false),
 #endif
 #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
       ftp_enabled_(false),
 #endif
       http_cache_enabled_(true),
       throttling_enabled_(false),
       sdch_enabled_(false),
       cookie_store_set_by_client_(false),
       net_log_(nullptr),
+      pac_quick_check_enabled_(true),
+      pac_sanitize_url_policy_(ProxyService::SanitizeUrlPolicy::SAFE),
+      ssl_config_service_(nullptr),
       socket_performance_watcher_factory_(nullptr) {
 }
 
 URLRequestContextBuilder::~URLRequestContextBuilder() {}
 
 void URLRequestContextBuilder::SetHttpNetworkSessionComponents(
     const URLRequestContext* request_context,
     HttpNetworkSession::Context* session_context) {
   session_context->host_resolver = request_context->host_resolver();
   session_context->cert_verifier = request_context->cert_verifier();
@@ skipping 99 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_));
 
-  storage->set_ssl_config_service(new SSLConfigServiceDefaults);
+  if (!ssl_config_service_) {

[eroman, 2017/06/08 00:45:56]

These changes seem unrelated.

[mmenke, 2017/06/08 16:36:28]

Thanks!  Reverted this change (Kept the quick_check_enabled/sanitize_url_policy
changes).  Initially did a lot more in one CL, realized it was way too big, and
split it up, but forgot to remove this part of it.

+    storage->set_ssl_config_service(new SSLConfigServiceDefaults);
+  } else {
+    context->set_ssl_config_service(ssl_config_service_);
+  }
 
   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_) {
     storage->set_cookie_store(std::move(cookie_store_));
@@ skipping 59 matching lines @@
     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());
+    proxy_service_->set_quick_check_enabled(pac_quick_check_enabled_);
+    proxy_service_->set_sanitize_url_policy(pac_sanitize_url_policy_);
   }
   storage->set_proxy_service(std::move(proxy_service_));
 
   HttpNetworkSession::Context network_session_context;
   SetHttpNetworkSessionComponents(context.get(), &network_session_context);
 
   if (proxy_delegate_) {
     network_session_context.proxy_delegate = proxy_delegate_.get();
     storage->set_proxy_delegate(std::move(proxy_delegate_));
   }
@@ skipping 78 matching lines @@
     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