Move ProxyConfigService construction onto the IO thread.

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 "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 127 matching lines @@
         base::Thread::Options(MessageLoop::TYPE_IO, 0));
   }
 
   scoped_refptr<base::MessageLoopProxy> cache_message_loop_proxy() {
     DCHECK(cache_thread_.IsRunning());
     return cache_thread_.message_loop_proxy();
   }
 
   void StartFileThread() {
     file_thread_.StartWithOptions(
-        base::Thread::Options(MessageLoop::TYPE_DEFAULT, 0));
+        base::Thread::Options(MessageLoop::TYPE_IO, 0));
   }
 
   MessageLoop* file_message_loop() {
     DCHECK(file_thread_.IsRunning());
     return file_thread_.message_loop();
   }
 
   virtual const std::string& GetUserAgent(
       const GURL& /* url */) const OVERRIDE {
     return user_agent_;
@@ skipping 28 matching lines @@
       http_pipelining_enabled(false),
       testing_fixed_http_port(0),
       testing_fixed_https_port(0),
       trusted_spdy_proxy() {}
 
 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
 {}
 
 URLRequestContextBuilder::URLRequestContextBuilder()
     : ftp_enabled_(false),
+#if defined(OS_LINUX)
+      glib_task_runner_(NULL),
+#endif  // defined(OS_LINUX)
       http_cache_enabled_(true) {}
+
 URLRequestContextBuilder::~URLRequestContextBuilder() {}
 
 #if defined(OS_LINUX)
-void URLRequestContextBuilder::set_proxy_config_service(
-    ProxyConfigService* proxy_config_service) {
-  proxy_config_service_.reset(proxy_config_service);
+void URLRequestContextBuilder::set_glib_task_runner(
+    base::SingleThreadTaskRunner* glib_task_runner) {
+  glib_task_runner_ = glib_task_runner;
 }
 #endif  // defined(OS_LINUX)
 
 URLRequestContext* URLRequestContextBuilder::Build() {
   BasicURLRequestContext* context = new BasicURLRequestContext;
   URLRequestContextStorage* storage = context->storage();
 
   context->set_user_agent(user_agent_);
 
   BasicNetworkDelegate* network_delegate = new BasicNetworkDelegate;
   storage->set_network_delegate(network_delegate);
 
   net::HostResolver* host_resolver = net::CreateSystemHostResolver(
       host_resolver_params_.parallelism,
       host_resolver_params_.retry_attempts,
       NULL /* no NetLog */);
   storage->set_host_resolver(host_resolver);
 
   if (ftp_enabled_) {
     storage->set_ftp_transaction_factory(new FtpNetworkLayer(host_resolver));
   }
 
   context->StartFileThread();
 
-  // TODO(willchan): Switch to using this code when
-  // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
-#if defined(OS_LINUX)
-  ProxyConfigService* proxy_config_service = proxy_config_service_.release();
-#else
-  ProxyConfigService* proxy_config_service =
-      ProxyService::CreateSystemProxyConfigService(
-          base::ThreadTaskRunnerHandle::Get(),
-          context->file_message_loop());
-#endif  // defined(OS_LINUX)
   storage->set_proxy_service(
       ProxyService::CreateUsingSystemProxyResolver(
-          proxy_config_service,
+          ProxyService::CreateSystemProxyConfigService(
+#if defined(OS_LINUX)
+              glib_task_runner_,
+#else
+              NULL,
+#endif  // defined(OS_LINUX)
+              context->file_message_loop()),
           4,  // TODO(willchan): Find a better constant somewhere.
           context->net_log()));
   storage->set_ssl_config_service(new net::SSLConfigServiceDefaults);
   storage->set_http_auth_handler_factory(
       net::HttpAuthHandlerRegistryFactory::CreateDefault(host_resolver));
   storage->set_cookie_store(new CookieMonster(NULL, NULL));
   storage->set_transport_security_state(new net::TransportSecurityState());
   storage->set_http_server_properties(new net::HttpServerPropertiesImpl);
   storage->set_cert_verifier(CertVerifier::CreateDefault());
 
@@ skipping 51 matching lines @@
     http_transaction_factory = new HttpNetworkLayer(network_session);
   }
   storage->set_http_transaction_factory(http_transaction_factory);
 
   // TODO(willchan): Support sdch.
 
   return context;
 }
 
 }  // namespace net