Move ProxyConfigService construction onto the IO thread.

chrome/service/net/service_url_request_context.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/service/net/service_url_request_context.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #include "base/compiler_specific.h"
 #include "base/message_loop_proxy.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/service/service_process.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
@@ skipping 125 matching lines @@
   // If the user agent is set explicitly return that, otherwise call the
   // base class method to return default value.
   return user_agent_.empty() ?
       net::URLRequestContext::GetUserAgent(url) : user_agent_;
 }
 
 ServiceURLRequestContext::~ServiceURLRequestContext() {
 }
 
 ServiceURLRequestContextGetter::ServiceURLRequestContextGetter()
-    : network_task_runner_(
+    : main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
+      network_task_runner_(
           g_service_process->io_thread()->message_loop_proxy()) {
   // Build the default user agent.
   user_agent_ = MakeUserAgentForServiceProcess();
+}
 
-  // TODO(sanjeevr): Change CreateSystemProxyConfigService to accept a
-  // MessageLoopProxy* instead of MessageLoop*.
-  DCHECK(g_service_process);
-  proxy_config_service_.reset(
-      net::ProxyService::CreateSystemProxyConfigService(
-          g_service_process->io_thread()->message_loop_proxy(),
-          g_service_process->file_thread()->message_loop()));
+void ServiceURLRequestContextGetter::StartTearDown() {
+  if (url_request_context_.get())
+    url_request_context_->proxy_service()->StartTearDown();
 }
 
 net::URLRequestContext*
 ServiceURLRequestContextGetter::GetURLRequestContext() {
-  if (!url_request_context_.get())
+  if (!url_request_context_.get()) {
+    // TODO(sanjeevr): Change CreateSystemProxyConfigService to accept a
+    // MessageLoopProxy* instead of MessageLoop*.
+    DCHECK(g_service_process);
     url_request_context_.reset(
-        new ServiceURLRequestContext(user_agent_,
-                                     proxy_config_service_.release()));
+        new ServiceURLRequestContext(
+            user_agent_,
+            net::ProxyService::CreateSystemProxyConfigService(
+                main_task_runner_,
+                g_service_process->file_thread()->message_loop())));
+  }
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const {
   return network_task_runner_;
 }
 
 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {}