Move initialization of ChromeURLRequestContexts to the IO thread.

chrome/browser/browsing_data_remover.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/browsing_data_remover.h"
 
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/cookie_monster.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 76 matching lines @@
 
   if (remove_mask & REMOVE_DOWNLOADS) {
     UserMetrics::RecordAction(L"ClearBrowsingData_Downloads", profile_);
     DownloadManager* download_manager = profile_->GetDownloadManager();
     download_manager->RemoveDownloadsBetween(delete_begin_, delete_end_);
     download_manager->ClearLastDownloadPath();
   }
 
   if (remove_mask & REMOVE_COOKIES) {
     UserMetrics::RecordAction(L"ClearBrowsingData_Cookies", profile_);
+    // Since we are running on the UI thread don't call GetURLRequestContext().
     net::CookieMonster* cookie_monster =
-        profile_->GetRequestContext()->cookie_store()->GetCookieMonster();
+        profile_->GetRequestContext()->GetCookieStore()->GetCookieMonster();
     if (cookie_monster)
       cookie_monster->DeleteAllCreatedBetween(delete_begin_, delete_end_, true);
   }
 
   if (remove_mask & REMOVE_PASSWORDS) {
     UserMetrics::RecordAction(L"ClearBrowsingData_Passwords", profile_);
     PasswordStore* password_store =
         profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS);
 
     password_store->RemoveLoginsCreatedBetween(delete_begin_, delete_end_);
@@ skipping 10 matching lines @@
 
   if (remove_mask & REMOVE_CACHE) {
     // Invoke ClearBrowsingDataView::ClearCache on the IO thread.
     base::Thread* thread = g_browser_process->io_thread();
     if (thread) {
       waiting_for_clear_cache_ = true;
       UserMetrics::RecordAction(L"ClearBrowsingData_Cache", profile_);
       thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
           this,
           &BrowsingDataRemover::ClearCacheOnIOThread,
+          profile_->GetRequestContext(),
           delete_begin_,
           delete_end_,
           MessageLoop::current()));
     }
   }
 
   NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::AddObserver(Observer* observer) {
@@ skipping 60 matching lines @@
   // As such, we do a delete later.
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void BrowsingDataRemover::ClearedCache() {
   waiting_for_clear_cache_ = false;
 
   NotifyAndDeleteIfDone();
 }
 
-void BrowsingDataRemover::ClearCacheOnIOThread(base::Time delete_begin,
-                                               base::Time delete_end,
-                                               MessageLoop* ui_loop) {
+void BrowsingDataRemover::ClearCacheOnIOThread(
+    URLRequestContextGetter* context_getter,
+    base::Time delete_begin,
+    base::Time delete_end,
+    MessageLoop* ui_loop) {
   // This function should be called on the IO thread.
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(ChromeThread::IO));
 
   // Get a pointer to the cache.
   net::HttpTransactionFactory* factory =
-      profile_->GetRequestContext()->http_transaction_factory();
+      context_getter->GetURLRequestContext()->http_transaction_factory();
   disk_cache::Backend* cache = factory->GetCache()->disk_cache();
 
   // |cache| can be null since it is lazily initialized, in this case we do
   // nothing.
   if (cache) {
     if (delete_begin.is_null())
       cache->DoomAllEntries();
     else
       cache->DoomEntriesBetween(delete_begin, delete_end);
   }
 
   // Get a pointer to the media cache.
-  factory = profile_->GetRequestContextForMedia()->http_transaction_factory();
+  factory = profile_->GetRequestContextForMedia()->GetURLRequestContext()->
+      http_transaction_factory();
   cache = factory->GetCache()->disk_cache();
 
   // |cache| can be null since it is lazily initialized, in this case we do
   // nothing.
   if (cache) {
     if (delete_begin.is_null())
       cache->DoomAllEntries();
     else
       cache->DoomEntriesBetween(delete_begin, delete_end);
   }
 
   // Notify the UI thread that we are done.
   ui_loop->PostTask(FROM_HERE, NewRunnableMethod(
       this, &BrowsingDataRemover::ClearedCache));
 }