Move initialization of ChromeURLRequestContexts to the IO thread.

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 106 matching lines @@
 
 bool HasACacheSubdir(const FilePath &dir) {
   return file_util::PathExists(GetCachePath(dir)) ||
          file_util::PathExists(GetMediaCachePath(dir));
 }
 
 }  // namespace
 
 // A pointer to the request context for the default profile.  See comments on
 // Profile::GetDefaultRequestContext.
-URLRequestContext* Profile::default_request_context_;
+URLRequestContextGetter* Profile::default_request_context_;
 
-static void CleanupRequestContext(ChromeURLRequestContext* context) {
+static void CleanupRequestContext(ChromeURLRequestContextGetter* context) {
   if (context) {
     context->CleanupOnUIThread();
 
     // Clean up request context on IO thread.
     g_browser_process->io_thread()->message_loop()->ReleaseSoon(FROM_HERE,
                                                                 context);
   }
 }
 
-static void CleanupAppCacheService(ChromeAppCacheService* appcache_service) {
-  if (appcache_service) {
-    // The I/O thread may be NULL during testing.
-    base::Thread* io_thread = g_browser_process->io_thread();
-    if (io_thread)
-      io_thread->message_loop()->ReleaseSoon(FROM_HERE, appcache_service);
-    else
-      appcache_service->Release();
-  }
-}
-
 // static
 const ProfileId Profile::InvalidProfileId = static_cast<ProfileId>(0);
 
 // static
 void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled, true);
   prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
   prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true);
   // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
   prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,
@@ skipping 12 matching lines @@
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties);
   prefs->RegisterBooleanPref(prefs::kDisableExtensions, false);
 }
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   return new ProfileImpl(path);
 }
 
 // static
-URLRequestContext* Profile::GetDefaultRequestContext() {
+URLRequestContextGetter* Profile::GetDefaultRequestContext() {
   return default_request_context_;
 }
 
 #if defined(OS_LINUX)
 // Temporarily disabled while we figure some stuff out.
 // http://code.google.com/p/chromium/issues/detail?id=12351
 // #include "chrome/browser/password_manager/password_store_gnome.h"
 // #include "chrome/browser/password_manager/password_store_kwallet.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/password_manager/password_store_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/keychain_mac.h"
 #include "chrome/browser/password_manager/login_database_mac.h"
 #include "chrome/browser/password_manager/password_store_mac.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OffTheRecordProfileImpl is a profile subclass that wraps an existing profile
 // to make it suitable for the off the record mode.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class OffTheRecordProfileImpl : public Profile,
                                 public NotificationObserver {
  public:
   explicit OffTheRecordProfileImpl(Profile* real_profile)
       : profile_(real_profile),
         extensions_request_context_(NULL),
         start_time_(Time::Now()) {
-    // Created here but lazily inititialized later, finally released on
-    // on the io thread, see CleanupAppCacheService.
-    appcache_service_ = new ChromeAppCacheService();
-    appcache_service_->AddRef();
-
-    request_context_ = ChromeURLRequestContext::CreateOffTheRecord(
-        this, appcache_service_);
+    request_context_ = ChromeURLRequestContextGetter::CreateOffTheRecord(this);
     request_context_->AddRef();
 
     // Register for browser close notifications so we can detect when the last
     // off-the-record window is closed, in which case we can clean our states
     // (cookies, downloads...).
     registrar_.Add(this, NotificationType::BROWSER_CLOSED,
                    NotificationService::AllSources());
   }
 
   virtual ~OffTheRecordProfileImpl() {
     CleanupRequestContext(request_context_);
     CleanupRequestContext(extensions_request_context_);
-    CleanupAppCacheService(appcache_service_);
   }
 
   virtual ProfileId GetRuntimeId() {
     return reinterpret_cast<ProfileId>(this);
   }
 
   virtual FilePath GetPath() { return profile_->GetPath(); }
 
   virtual bool IsOffTheRecord() {
     return true;
   }
 
   virtual Profile* GetOffTheRecordProfile() {
     return this;
   }
 
   virtual void DestroyOffTheRecordProfile() {
     // Suicide is bad!
     NOTREACHED();
   }
 
   virtual Profile* GetOriginalProfile() {
     return profile_;
   }
 
-  virtual ChromeAppCacheService* GetAppCacheService() {
-    DCHECK(request_context_);  // should be created in ctor
-    if (!appcache_service_->is_initialized())
-      appcache_service_->InitializeOnUIThread(GetPath(), true);
-    return appcache_service_;
-  }
-
   virtual VisitedLinkMaster* GetVisitedLinkMaster() {
     // We don't provide access to the VisitedLinkMaster when we're OffTheRecord
     // because we don't want to leak the sites that the user has visited before.
     return NULL;
   }
 
   virtual ExtensionsService* GetExtensionsService() {
     return NULL;
   }
 
@@ skipping 112 matching lines @@
   }
 
   virtual Extension* GetTheme() {
     return GetOriginalProfile()->GetTheme();
   }
 
   virtual ThemeProvider* GetThemeProvider() {
     return GetOriginalProfile()->GetThemeProvider();
   }
 
-  virtual URLRequestContext* GetRequestContext() {
+  virtual URLRequestContextGetter* GetRequestContext() {
     return request_context_;
   }
 
-  virtual URLRequestContext* GetRequestContextForMedia() {
+  virtual URLRequestContextGetter* GetRequestContextForMedia() {
     // In OTR mode, media request context is the same as the original one.
     return request_context_;
   }
 
-  URLRequestContext* GetRequestContextForExtensions() {
+  URLRequestContextGetter* GetRequestContextForExtensions() {
     if (!extensions_request_context_) {
       extensions_request_context_ =
-          ChromeURLRequestContext::CreateOffTheRecordForExtensions(this);
+          ChromeURLRequestContextGetter::CreateOffTheRecordForExtensions(this);
       extensions_request_context_->AddRef();
-
-      DCHECK(extensions_request_context_->cookie_store());
     }
 
     return extensions_request_context_;
   }
 
   virtual net::SSLConfigService* GetSSLConfigService() {
     return GetOriginalProfile()->GetSSLConfigService();
   }
 
   virtual Blacklist* GetBlacklist() {
@@ skipping 118 matching lines @@
       ExitedOffTheRecordMode();
   }
 
  private:
   NotificationRegistrar registrar_;
 
   // The real underlying profile.
   Profile* profile_;
 
   // The context to use for requests made from this OTR session.
-  ChromeURLRequestContext* request_context_;
+  ChromeURLRequestContextGetter* request_context_;
 
-  ChromeURLRequestContext* extensions_request_context_;
-
-  // Use a seperate appcache service for OTR.
-  ChromeAppCacheService* appcache_service_;
+  ChromeURLRequestContextGetter* extensions_request_context_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
   // Use a special WebKit context for OTR browsing.
   scoped_refptr<WebKitContext> webkit_context_;
 
   // We don't want SSLHostState from the OTR profile to leak back to the main
   // profile because then the main profile would learn some of the host names
   // the user visited while OTR.
@@ skipping 30 matching lines @@
                             "profile files to the root directory!";
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableExtensionTimelineApi)) {
     extension_devtools_manager_ = new ExtensionDevToolsManager(this);
   }
 
-  // Created here but lazily inititialized later, finally released on
-  // on the io thread, see CleanupAppCacheService.
-  appcache_service_ = new ChromeAppCacheService();
-  appcache_service_->AddRef();
-
   extension_process_manager_.reset(new ExtensionProcessManager(this));
   extension_message_service_ = new ExtensionMessageService(this);
 
   PrefService* prefs = GetPrefs();
   prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this);
   prefs->AddPrefObserver(prefs::kEnableSpellCheck, this);
   prefs->AddPrefObserver(prefs::kEnableAutoSpellCorrect, this);
 
   if (CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kPrivacyBlacklist)) {
@@ skipping 160 matching lines @@
     // We use default_request_context_ for OCSP.
     // Release URLRequestContext used in OCSP handlers.
     net::SetURLRequestContextForOCSP(NULL);
 #endif
     default_request_context_ = NULL;
   }
 
   CleanupRequestContext(request_context_);
   CleanupRequestContext(media_request_context_);
   CleanupRequestContext(extensions_request_context_);
-  CleanupAppCacheService(appcache_service_);
 
   // When the request contexts are gone, the blacklist wont be needed anymore.
   delete blacklist_;
   blacklist_ = 0;
 
   // HistoryService may call into the BookmarkModel, as such we need to
   // delete HistoryService before the BookmarkModel. The destructor for
   // HistoryService will join with HistoryService's backend thread so that
   // by the time the destructor has finished we're sure it will no longer call
   // into the BookmarkModel.
@@ skipping 34 matching lines @@
 }
 
 void ProfileImpl::DestroyOffTheRecordProfile() {
   off_the_record_profile_.reset();
 }
 
 Profile* ProfileImpl::GetOriginalProfile() {
   return this;
 }
 
-ChromeAppCacheService* ProfileImpl::GetAppCacheService() {
-  if (!appcache_service_->is_initialized()) {
-    EnsureRequestContextCreated();
-    appcache_service_->InitializeOnUIThread(GetPath(), false);
-  }
-  return appcache_service_;
-}
-
 VisitedLinkMaster* ProfileImpl::GetVisitedLinkMaster() {
   if (!visited_link_master_.get()) {
     scoped_ptr<VisitedLinkMaster> visited_links(
       new VisitedLinkMaster(g_browser_process->file_thread(),
                             visited_link_event_listener_.get(), this));
     if (!visited_links->Init())
       return NULL;
     visited_link_master_.swap(visited_links);
   }
 
@@ skipping 68 matching lines @@
 
   return prefs_.get();
 }
 
 FilePath ProfileImpl::GetPrefFilePath() {
   FilePath pref_file_path = path_;
   pref_file_path = pref_file_path.Append(chrome::kPreferencesFilename);
   return pref_file_path;
 }
 
-URLRequestContext* ProfileImpl::GetRequestContext() {
+URLRequestContextGetter* ProfileImpl::GetRequestContext() {
   if (!request_context_) {
     FilePath cookie_path = GetPath();
     cookie_path = cookie_path.Append(chrome::kCookieFilename);
     FilePath cache_path = base_cache_path_;
     int max_size;
     GetCacheParameters(kNormalContext, &cache_path, &max_size);
 
     cache_path = GetCachePath(cache_path);
-    request_context_ = ChromeURLRequestContext::CreateOriginal(
-        this, cookie_path, cache_path, max_size, appcache_service_);
+    request_context_ = ChromeURLRequestContextGetter::CreateOriginal(
+        this, cookie_path, cache_path, max_size);
     request_context_->AddRef();
 
     // The first request context is always a normal (non-OTR) request context.
     // Even when Chromium is started in OTR mode, a normal profile is always
     // created first.
     if (!default_request_context_) {
       default_request_context_ = request_context_;
+      // TODO(eroman): this isn't terribly useful anymore now that the
+      // URLRequestContext is constructed by the IO thread...
       NotificationService::current()->Notify(
           NotificationType::DEFAULT_REQUEST_CONTEXT_AVAILABLE,
           NotificationService::AllSources(), NotificationService::NoDetails());
-#if defined(OS_LINUX)
-      // TODO(ukai): find a better way to set the URLRequestContext for OCSP.
-      net::SetURLRequestContextForOCSP(default_request_context_);
-#endif
     }
-
-    DCHECK(request_context_->cookie_store());
   }
 
   return request_context_;
 }
 
-URLRequestContext* ProfileImpl::GetRequestContextForMedia() {
+URLRequestContextGetter* ProfileImpl::GetRequestContextForMedia() {
   if (!media_request_context_) {
     FilePath cache_path = base_cache_path_;
     int max_size;
     GetCacheParameters(kMediaContext, &cache_path, &max_size);
 
     cache_path = GetMediaCachePath(cache_path);
-    media_request_context_ = ChromeURLRequestContext::CreateOriginalForMedia(
-        this, cache_path, max_size, appcache_service_);
+    media_request_context_ =
+        ChromeURLRequestContextGetter::CreateOriginalForMedia(
+            this, cache_path, max_size);
     media_request_context_->AddRef();
-
-    DCHECK(media_request_context_->cookie_store());
   }
 
   return media_request_context_;
 }
 
 FaviconService* ProfileImpl::GetFaviconService(ServiceAccessType sat) {
   if (!favicon_service_created_) {
     favicon_service_created_ = true;
     scoped_refptr<FaviconService> service(new FaviconService(this));
     favicon_service_.swap(service);
   }
   return favicon_service_.get();
 }
 
-URLRequestContext* ProfileImpl::GetRequestContextForExtensions() {
+URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
   if (!extensions_request_context_) {
     FilePath cookie_path = GetPath();
     cookie_path = cookie_path.Append(chrome::kExtensionsCookieFilename);
 
     extensions_request_context_ =
-        ChromeURLRequestContext::CreateOriginalForExtensions(this, cookie_path);
+        ChromeURLRequestContextGetter::CreateOriginalForExtensions(
+            this, cookie_path);
     extensions_request_context_->AddRef();
-
-    DCHECK(extensions_request_context_->cookie_store());
   }
 
   return extensions_request_context_;
 }
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
 
 Blacklist* ProfileImpl::GetBlacklist() {
@@ skipping 385 matching lines @@
 #endif
   return NULL;
 }
 
 void ProfileImpl::InitSyncService() {
 #if defined(BROWSER_SYNC)
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 #endif
 }