Move ProxyConfigService construction onto the IO thread.

chrome/browser/profiles/profile_io_data.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/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 117 matching lines @@
 };
 
 Profile* GetProfileOnUI(ProfileManager* profile_manager, Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   if (profile_manager->IsValidProfile(profile))
     return profile;
   return NULL;
 }
 
+// Inform PrefProxyConfigTracker of underlying ChromeProxyConfigService.
+void SetChromeProxyConfigService(
+    base::Callback<Profile*(void)> profile_getter,
+    ChromeProxyConfigService* chrome_proxy_config_service) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  Profile* profile = profile_getter.Run();
+  if (profile) {
+    profile->GetProxyConfigTracker()->SetChromeProxyConfigService(
+        chrome_proxy_config_service);
+  }
+}
+
 }  // namespace
 
 void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* pref_service = profile->GetPrefs();
 
   scoped_ptr<ProfileParams> params(new ProfileParams);
   params->path = profile->GetPath();
 
   // Set up Accept-Language and Accept-Charset header values
@@ skipping 44 matching lines @@
   ProtocolHandlerRegistry* protocol_handler_registry =
       ProtocolHandlerRegistryFactory::GetForProfile(profile);
   DCHECK(protocol_handler_registry);
 
   // The profile instance is only available here in the InitializeOnUIThread
   // method, so we create the url interceptor here, then save it for
   // later delivery to the job factory in LazyInitialize.
   params->protocol_handler_interceptor.reset(
       protocol_handler_registry->CreateURLInterceptor());
 
-  ChromeProxyConfigService* proxy_config_service =
-      ProxyServiceFactory::CreateProxyConfigService(true);
-  params->proxy_config_service.reset(proxy_config_service);
-  profile->GetProxyConfigTracker()->SetChromeProxyConfigService(
-      proxy_config_service);
+  params->profile_getter = profile_getter;
   params->profile = profile;
   profile_params_.reset(params.release());
 
   ChromeNetworkDelegate::InitializePrefsOnUIThread(
       &enable_referrers_,
       &enable_do_not_track_,
       pref_service);
 
 #if defined(ENABLE_PRINTING)
   printing_enabled_.Init(prefs::kPrintingEnabled, pref_service, NULL);
@@ skipping 328 matching lines @@
         profile_params_->profile,
         profile_params_->cookie_settings,
         &enable_referrers_,
         &enable_do_not_track_,
         load_time_stats_));
 
   fraudulent_certificate_reporter_.reset(
       new chrome_browser_net::ChromeFraudulentCertificateReporter(
           main_request_context_.get()));
 
+  ChromeProxyConfigService* proxy_config_service =
+      ProxyServiceFactory::CreateProxyConfigService(true);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+      base::Bind(&SetChromeProxyConfigService,
+                 profile_params_->profile_getter,
+                 proxy_config_service));
+
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
           io_thread->net_log(),
           io_thread_globals->proxy_script_fetcher_context.get(),
-          profile_params_->proxy_config_service.release(),
+          proxy_config_service,
           command_line));
 
   transport_security_state_.reset(new net::TransportSecurityState());
   transport_security_persister_.reset(
       new TransportSecurityPersister(transport_security_state_.get(),
                                      profile_params_->path,
                                      is_incognito()));
   const std::string& serialized =
       command_line.GetSwitchValueASCII(switches::kHstsHosts);
   transport_security_persister_.get()->DeserializeFromCommandLine(serialized);
@@ skipping 100 matching lines @@
 #if !defined(OS_CHROMEOS)
   enable_metrics_.Destroy();
 #endif
   safe_browsing_enabled_.Destroy();
   printing_enabled_.Destroy();
   session_startup_pref_.Destroy();
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url_blacklist_manager_.get())
     url_blacklist_manager_->ShutdownOnUIThread();
 #endif
+  if (proxy_service_.get())
+    proxy_service_->StartTearDown();
   bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
   if (!posted)
     delete this;
 }
 
 void ProfileIOData::set_server_bound_cert_service(
     net::ServerBoundCertService* server_bound_cert_service) const {
   server_bound_cert_service_.reset(server_bound_cert_service);
 }
 
@@ skipping 26 matching lines @@
   params->http_pipelining_enabled = globals->http_pipelining_enabled;
   params->testing_fixed_http_port = globals->testing_fixed_http_port;
   params->testing_fixed_https_port = globals->testing_fixed_https_port;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
     params->trusted_spdy_proxy = command_line.GetSwitchValueASCII(
         switches::kTrustedSpdyProxy);
   }
 }