Switched from having one URLRequestJobFactory per profile to having one per context.

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 491 matching lines @@
 
   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);
 
+  // Take ownership over these parameters.
+  cookie_settings_ = profile_params_->cookie_settings;
+#if defined(ENABLE_NOTIFICATIONS)
+  notification_service_ = profile_params_->notification_service;
+#endif
+  extension_info_map_ = profile_params_->extension_info_map;
+
+  resource_context_->host_resolver_ = io_thread_globals->host_resolver.get();
+  resource_context_->request_context_ = main_request_context_.get();
+
+  if (profile_params_->resource_prefetch_predictor_observer_.get()) {
+    resource_prefetch_predictor_observer_.reset(
+        profile_params_->resource_prefetch_predictor_observer_.release());
+  }
+
+  LazyInitializeInternal(profile_params_.get());
+
+  profile_params_.reset();
+  initialized_ = true;
+}
+
+void ProfileIOData::ApplyProfileParamsToContext(
+    ChromeURLRequestContext* context) const {
+  context->set_is_incognito(is_incognito());
+  context->set_accept_language(profile_params_->accept_language);
+  context->set_accept_charset(profile_params_->accept_charset);
+  context->set_referrer_charset(profile_params_->referrer_charset);
+  context->set_ssl_config_service(profile_params_->ssl_config_service);
+}
+
+void ProfileIOData::SetUpJobFactoryDefaults(
+    net::URLRequestJobFactory* job_factory) const {
   // NOTE(willchan): Keep these protocol handlers in sync with
   // ProfileIOData::IsHandledProtocol().
-  job_factory_.reset(new net::URLRequestJobFactory);
   if (profile_params_->protocol_handler_registry) {
-    job_factory_->AddInterceptor(
+    job_factory->AddInterceptor(
         new ProtocolHandlerRegistryInterceptor(
             profile_params_->protocol_handler_registry));
   }
-  bool set_protocol = job_factory_->SetProtocolHandler(
+  bool set_protocol = job_factory->SetProtocolHandler(
       chrome::kExtensionScheme,
       CreateExtensionProtocolHandler(is_incognito(),
                                      profile_params_->extension_info_map));
   DCHECK(set_protocol);
-  set_protocol = job_factory_->SetProtocolHandler(
+  set_protocol = job_factory->SetProtocolHandler(
       chrome::kExtensionResourceScheme,
       CreateExtensionResourceProtocolHandler());
   DCHECK(set_protocol);
-  set_protocol = job_factory_->SetProtocolHandler(
+  set_protocol = job_factory->SetProtocolHandler(
       chrome::kChromeUIScheme,
       ChromeURLDataManagerBackend::CreateProtocolHandler(
           chrome_url_data_manager_backend_.get()));
   DCHECK(set_protocol);
-  set_protocol = job_factory_->SetProtocolHandler(
+  set_protocol = job_factory->SetProtocolHandler(
       chrome::kChromeDevToolsScheme,
       CreateDevToolsProtocolHandler(chrome_url_data_manager_backend_.get()));
   DCHECK(set_protocol);
 #if defined(OS_CHROMEOS)
   if (!is_incognito()) {
-    set_protocol = job_factory_->SetProtocolHandler(
+    set_protocol = job_factory->SetProtocolHandler(
         chrome::kDriveScheme, new gdata::GDataProtocolHandler());
     DCHECK(set_protocol);
   }
 #if !defined(GOOGLE_CHROME_BUILD)
   // Install the GView request interceptor that will redirect requests
   // of compatible documents (PDF, etc) to the GView document viewer.
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(switches::kEnableGView))
-    job_factory_->AddInterceptor(new chromeos::GViewRequestInterceptor);
+    job_factory->AddInterceptor(new chromeos::GViewRequestInterceptor);
 #endif  // !defined(GOOGLE_CHROME_BUILD)
 #endif  // defined(OS_CHROMEOS)
-
-  // Take ownership over these parameters.
-  cookie_settings_ = profile_params_->cookie_settings;
-#if defined(ENABLE_NOTIFICATIONS)
-  notification_service_ = profile_params_->notification_service;
-#endif
-  extension_info_map_ = profile_params_->extension_info_map;
-
-  resource_context_->host_resolver_ = io_thread_globals->host_resolver.get();
-  resource_context_->request_context_ = main_request_context_.get();
-
-  if (profile_params_->resource_prefetch_predictor_observer_.get()) {
-    resource_prefetch_predictor_observer_.reset(
-        profile_params_->resource_prefetch_predictor_observer_.release());
-  }
-
-  LazyInitializeInternal(profile_params_.get());
-
-  profile_params_.reset();
-  initialized_ = true;
-}
-
-void ProfileIOData::ApplyProfileParamsToContext(
-    ChromeURLRequestContext* context) const {
-  context->set_is_incognito(is_incognito());
-  context->set_accept_language(profile_params_->accept_language);
-  context->set_accept_charset(profile_params_->accept_charset);
-  context->set_referrer_charset(profile_params_->referrer_charset);
-  context->set_ssl_config_service(profile_params_->ssl_config_service);
 }
 
 void ProfileIOData::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   enable_referrers_.Destroy();
 #if !defined(OS_CHROMEOS)
   enable_metrics_.Destroy();
 #endif
   safe_browsing_enabled_.Destroy();
   session_startup_pref_.Destroy();
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url_blacklist_manager_.get())
     url_blacklist_manager_->ShutdownOnUIThread();
 #endif
   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);
 }
 
 void ProfileIOData::DestroyResourceContext() {
   resource_context_.reset();
 }