Revert 92668 - Remove more unnecessary ChromeURLRequestContext members.

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
-#include "base/task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/chrome_blob_storage_context.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/resource_context.h"
 #include "content/common/notification_service.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_url_request_job_factory.h"
-#include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_url_request_job_factory.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace {
 
@@ skipping 236 matching lines @@
       profile(NULL) {}
 ProfileIOData::ProfileParams::~ProfileParams() {}
 
 ProfileIOData::ProfileIOData(bool is_incognito)
     : initialized_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(resource_context_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 ProfileIOData::~ProfileIOData() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  // If we have never initialized ProfileIOData, then Handle may hold the only
+  // reference to it. The important thing is to make sure it hasn't been
+  // initialized yet, because the lazily initialized variables are supposed to
+  // live on the IO thread.
+  if (BrowserThread::CurrentlyOn(BrowserThread::UI))
+    DCHECK(!initialized_);
+  else
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 // static
 bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
   DCHECK_EQ(scheme, StringToLowerASCII(scheme));
   static const char* const kProtocolList[] = {
     chrome::kExtensionScheme,
     chrome::kChromeUIScheme,
     chrome::kChromeDevToolsScheme,
 #if defined(OS_CHROMEOS)
@@ skipping 11 matching lines @@
 
 bool ProfileIOData::IsHandledURL(const GURL& url) {
   if (!url.is_valid()) {
     // We handle error cases.
     return true;
   }
 
   return IsHandledProtocol(url.scheme());
 }
 
-const content::ResourceContext& ProfileIOData::GetResourceContext() const {
-  return resource_context_;
-}
-
-ChromeURLDataManagerBackend*
-ProfileIOData::GetChromeURLDataManagerBackend() const {
-  LazyInitialize();
-  return chrome_url_data_manager_backend_.get();
-}
-
 scoped_refptr<ChromeURLRequestContext>
 ProfileIOData::GetMainRequestContext() const {
   LazyInitialize();
   scoped_refptr<RequestContext> context = main_request_context_;
   context->set_profile_io_data(const_cast<ProfileIOData*>(this));
   main_request_context_ = NULL;
   return context;
 }
 
 scoped_refptr<ChromeURLRequestContext>
@@ skipping 27 matching lines @@
     scoped_refptr<RequestContext> request_context =
         AcquireIsolatedAppRequestContext(main_context, app_id);
     request_context->set_profile_io_data(const_cast<ProfileIOData*>(this));
     app_request_context_map_[app_id] = request_context;
     context = request_context;
   }
   DCHECK(context);
   return context;
 }
 
+const content::ResourceContext& ProfileIOData::GetResourceContext() const {
+  return resource_context_;
+}
+
 ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const {
   return extension_info_map_;
 }
 
 HostContentSettingsMap* ProfileIOData::GetHostContentSettingsMap() const {
   return host_content_settings_map_;
 }
 
 DesktopNotificationService* ProfileIOData::GetNotificationService() const {
   return notification_service_;
@@ skipping 56 matching lines @@
   }
   bool set_protocol = job_factory_->SetProtocolHandler(
       chrome::kExtensionScheme,
       CreateExtensionProtocolHandler(profile_params_->is_incognito,
                                      profile_params_->extension_info_map));
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kChromeUIScheme,
       ChromeURLDataManagerBackend::CreateProtocolHandler(
           chrome_url_data_manager_backend_.get(),
-          profile_params_->appcache_service,
-          profile_params_->blob_storage_context->controller()));
+          profile_params_->appcache_service));
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kChromeDevToolsScheme,
       CreateDevToolsProtocolHandler(chrome_url_data_manager_backend_.get()));
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kBlobScheme,
       new ChromeBlobProtocolHandler(
           profile_params_->blob_storage_context->controller(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
@@ skipping 45 matching lines @@
 
 void ProfileIOData::ApplyProfileParamsToContext(
     ChromeURLRequestContext* context) const {
   context->set_is_incognito(profile_params_->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_transport_security_state(
       profile_params_->transport_security_state);
   context->set_ssl_config_service(profile_params_->ssl_config_service);
+  context->set_appcache_service(profile_params_->appcache_service);
+  context->set_blob_storage_context(profile_params_->blob_storage_context);
+  context->set_file_system_context(profile_params_->file_system_context);
+  context->set_extension_info_map(profile_params_->extension_info_map);
 }
 
 void ProfileIOData::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   enable_referrers_.Destroy();
   clear_local_state_on_exit_.Destroy();
   safe_browsing_enabled_.Destroy();
-  bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                                        new ReleaseTask<ProfileIOData>(this));
-  DCHECK(posted);
 }