Move ProxyConfigService construction onto the IO thread.

net/proxy/proxy_service.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/proxy/proxy_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1300 matching lines @@
   if (resolver_.get())
     resolver_->PurgeMemory();
 }
 
 void ProxyService::ForceReloadProxyConfig() {
   DCHECK(CalledOnValidThread());
   ResetProxyConfig(false);
   ApplyProxyConfigIfAvailable();
 }
 
+void ProxyService::StartTearDown() {
+  config_service_->StartTearDown();
+}
+
 // static
 ProxyConfigService* ProxyService::CreateSystemProxyConfigService(
-    base::SingleThreadTaskRunner* io_thread_task_runner,
+    base::SingleThreadTaskRunner* glib_thread_task_runner,
     MessageLoop* file_loop) {
 #if defined(OS_WIN)
   return new ProxyConfigServiceWin();
 #elif defined(OS_IOS)
   return new ProxyConfigServiceIOS();
 #elif defined(OS_MACOSX)
-  return new ProxyConfigServiceMac(io_thread_task_runner);
+  return new ProxyConfigServiceMac(
+      MessageLoopForIO::current()->message_loop_proxy());
 #elif defined(OS_CHROMEOS)
   LOG(ERROR) << "ProxyConfigService for ChromeOS should be created in "
              << "profile_io_data.cc::CreateProxyConfigService and this should "
              << "be used only for examples.";
   return new UnsetProxyConfigService;
 #elif defined(OS_LINUX)
-  ProxyConfigServiceLinux* linux_config_service =
-      new ProxyConfigServiceLinux();
-
-  // Assume we got called on the thread that runs the default glib
-  // main loop, so the current thread is where we should be running
-  // gconf calls from.
-  scoped_refptr<base::SingleThreadTaskRunner> glib_thread_task_runner =
-      base::ThreadTaskRunnerHandle::Get();
-
   // The file loop should be a MessageLoopForIO on Linux.
   DCHECK_EQ(MessageLoop::TYPE_IO, file_loop->type());
-
-  // Synchronously fetch the current proxy config (since we are
-  // running on glib_default_loop). Additionally register for
-  // notifications (delivered in either |glib_default_loop| or
-  // |file_loop|) to keep us updated when the proxy config changes.
-  linux_config_service->SetupAndFetchInitialConfig(
-      glib_thread_task_runner, io_thread_task_runner,
+  return new ProxyConfigServiceLinux(
+      glib_thread_task_runner,
+      MessageLoopForIO::current()->message_loop_proxy(),
       static_cast<MessageLoopForIO*>(file_loop));
-
-  return linux_config_service;
 #elif defined(OS_ANDROID)
   return new ProxyConfigServiceAndroid(
-      io_thread_task_runner,
-      MessageLoopForUI::current()->message_loop_proxy());
+      glib_thread_task_runner,
+      MessageLoopForIO::current()->message_loop_proxy());
 #else
   LOG(WARNING) << "Failed to choose a system proxy settings fetcher "
                   "for this platform.";
   return new ProxyConfigServiceDirect();
 #endif
 }
 
 // static
 const ProxyService::PacPollPolicy* ProxyService::set_pac_script_poll_policy(
     const PacPollPolicy* policy) {
@@ skipping 180 matching lines @@
     OnCompletion(result_);
   }
 }
 
 void SyncProxyServiceHelper::OnCompletion(int rv) {
   result_ = rv;
   event_.Signal();
 }
 
 }  // namespace net