Move creation of BrowserContext objects that live in content to content, instead of depending on th…

chrome/browser/browsing_data_remover.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/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 40 matching lines @@
 #include "net/base/origin_bound_cert_service.h"
 #include "net/base/origin_bound_cert_store.h"
 #include "net/base/transport_security_state.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
+using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadManager;
 using content::UserMetricsAction;
 
 bool BrowsingDataRemover::removing_ = false;
 
 BrowsingDataRemover::NotificationDetails::NotificationDetails()
     : removal_begin(base::Time()),
       removal_mask(-1) {
 }
@@ skipping 184 matching lines @@
           base::Bind(&BrowsingDataRemover::ClearOriginBoundCertsOnIOThread,
                      base::Unretained(this), base::Unretained(rq_context)));
     }
   }
 
   if (remove_mask & REMOVE_LOCAL_STORAGE) {
     // Remove data such as local databases, STS state, etc. These only can
     // be removed if a WEBKIT thread exists, so check that first:
     if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
       // We assume the end time is now.
-      profile_->GetWebKitContext()->DeleteDataModifiedSince(delete_begin_);
+      BrowserContext::GetWebKitContext(profile_)->
+          DeleteDataModifiedSince(delete_begin_);
     }
   }
 
   if (remove_mask & REMOVE_INDEXEDDB || remove_mask & REMOVE_WEBSQL ||
       remove_mask & REMOVE_APPCACHE || remove_mask & REMOVE_FILE_SYSTEMS) {
     // TODO(mkwst): At the moment, we don't have the ability to pass a mask into
     // QuotaManager. Until then, we'll clear all quota-managed data types if any
     // ought to be cleared.
-    quota_manager_ = profile_->GetQuotaManager();
-    if (quota_manager_) {
-      waiting_for_clear_quota_managed_data_ = true;
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          base::Bind(&BrowsingDataRemover::ClearQuotaManagedDataOnIOThread,
-                     base::Unretained(this)));
-    }
+    if (!quota_manager_)
+      quota_manager_ = content::BrowserContext::GetQuotaManager(profile_);
+    waiting_for_clear_quota_managed_data_ = true;
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&BrowsingDataRemover::ClearQuotaManagedDataOnIOThread,
+                   base::Unretained(this)));
   }
 
   if (remove_mask & REMOVE_PLUGIN_DATA) {
     content::RecordAction(UserMetricsAction("ClearBrowsingData_LSOData"));
 
     waiting_for_clear_plugin_data_ = true;
     if (!plugin_data_remover_.get()) {
       plugin_data_remover_.reset(
           content::PluginDataRemover::Create(profile_->GetResourceContext()));
     }
@@ skipping 65 matching lines @@
 
 void BrowsingDataRemover::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void BrowsingDataRemover::OnHistoryDeletionDone() {
   waiting_for_clear_history_ = false;
   NotifyAndDeleteIfDone();
 }
 
+void BrowsingDataRemover::OverrideQuotaManagerForTesting(
+    quota::QuotaManager* quota_manager) {
+  quota_manager_ = quota_manager;
+}
+
 base::Time BrowsingDataRemover::CalculateBeginDeleteTime(
     TimePeriod time_period) {
   base::TimeDelta diff;
   base::Time delete_begin_time = base::Time::Now();
   switch (time_period) {
     case LAST_HOUR:
       diff = base::TimeDelta::FromHours(1);
       break;
     case LAST_DAY:
       diff = base::TimeDelta::FromHours(24);
@@ skipping 164 matching lines @@
   // the user-specified timeframe, and deal with the resulting set in
   // OnGotQuotaManagedOrigins().
   quota_managed_origins_to_delete_count_ = 0;
   quota_managed_storage_types_to_delete_count_ = 2;
 
   if (delete_begin_ == base::Time()) {
     // If we're deleting since the beginning of time, ask the QuotaManager for
     // all origins with persistent quota modified within the user-specified
     // timeframe, and deal with the resulting set in
     // OnGotPersistentQuotaManagedOrigins.
-    profile_->GetQuotaManager()->GetOriginsModifiedSince(
+    quota_manager_->GetOriginsModifiedSince(
         quota::kStorageTypePersistent, delete_begin_,
         base::Bind(&BrowsingDataRemover::OnGotQuotaManagedOrigins,
                    base::Unretained(this)));
   } else {
     // Otherwise, we don't need to deal with persistent storage.
     --quota_managed_storage_types_to_delete_count_;
   }
 
   // Do the same for temporary quota, regardless, passing the resulting set into
   // OnGotTemporaryQuotaManagedOrigins.
-  profile_->GetQuotaManager()->GetOriginsModifiedSince(
+  quota_manager_->GetOriginsModifiedSince(
       quota::kStorageTypeTemporary, delete_begin_,
       base::Bind(&BrowsingDataRemover::OnGotQuotaManagedOrigins,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnGotQuotaManagedOrigins(
     const std::set<GURL>& origins, quota::StorageType type) {
   DCHECK_GT(quota_managed_storage_types_to_delete_count_, 0);
   // Walk through the origins passed in, delete quota of |type| from each that
   // isn't protected.
@@ skipping 85 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataRemover::OnClearedOriginBoundCerts,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnClearedOriginBoundCerts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_origin_bound_certs_ = false;
   NotifyAndDeleteIfDone();
 }