Quota: Add quota::StorageType to the GetOriginsCallback definition.

chrome/browser/browsing_data_remover.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/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 447 matching lines @@
   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::kStorageTypePersistent, delete_begin_, NewCallback(this,
-            &BrowsingDataRemover::OnGotPersistentQuotaManagedOrigins));
+            &BrowsingDataRemover::OnGotQuotaManagedOrigins));
   } 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::kStorageTypeTemporary, delete_begin_, NewCallback(this,
-          &BrowsingDataRemover::OnGotTemporaryQuotaManagedOrigins));
+          &BrowsingDataRemover::OnGotQuotaManagedOrigins));
 }
 
-void BrowsingDataRemover::OnGotTemporaryQuotaManagedOrigins(
-    const std::set<GURL>& origins) {
+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 temporary quota from each that
+  // Walk through the origins passed in, delete quota of |type| from each that
   // isn't protected.
   std::set<GURL>::const_iterator origin;
   for (origin = origins.begin(); origin != origins.end(); ++origin) {
     if (special_storage_policy_->IsStorageProtected(origin->GetOrigin()))
       continue;
     ++quota_managed_origins_to_delete_count_;
     quota_manager_->DeleteOriginData(origin->GetOrigin(),
-        quota::kStorageTypeTemporary, NewCallback(this,
-            &BrowsingDataRemover::OnQuotaManagedOriginDeletion));
+        type, NewCallback(this,
+                          &BrowsingDataRemover::OnQuotaManagedOriginDeletion));
   }
 
   --quota_managed_storage_types_to_delete_count_;
-  if (quota_managed_storage_types_to_delete_count_ == 0 &&
-      quota_managed_origins_to_delete_count_ == 0)
-    CheckQuotaManagedDataDeletionStatus();
-}
-
-void BrowsingDataRemover::OnGotPersistentQuotaManagedOrigins(
-    const std::set<GURL>& origins) {
-  DCHECK_GT(quota_managed_storage_types_to_delete_count_, 0);
-  // Walk through the origins passed in, delete persistent quota from each that
-  // isn't protected.
-  std::set<GURL>::const_iterator origin;
-  for (origin = origins.begin(); origin != origins.end(); ++origin) {
-    if (special_storage_policy_->IsStorageProtected(origin->GetOrigin()))
-      continue;
-    ++quota_managed_origins_to_delete_count_;
-    quota_manager_->DeleteOriginData(origin->GetOrigin(),
-        quota::kStorageTypePersistent, NewCallback(this,
-            &BrowsingDataRemover::OnQuotaManagedOriginDeletion));
-  }
-
-  --quota_managed_storage_types_to_delete_count_;
   if (quota_managed_storage_types_to_delete_count_ == 0 &&
       quota_managed_origins_to_delete_count_ == 0)
     CheckQuotaManagedDataDeletionStatus();
 }
 
 void BrowsingDataRemover::OnQuotaManagedOriginDeletion(
     quota::QuotaStatusCode status) {
   DCHECK_GT(quota_managed_origins_to_delete_count_, 0);
   if (status != quota::kQuotaStatusOk) {
     // TODO(mkwst): We should add the GURL to StatusCallback; this is a pretty
@@ skipping 18 matching lines @@
       NewRunnableMethod(
           this,
           &BrowsingDataRemover::NotifyAndDeleteIfDone));
 }
 
 void BrowsingDataRemover::OnWaitableEventSignaled(
     base::WaitableEvent* waitable_event) {
   waiting_for_clear_lso_data_ = false;
   NotifyAndDeleteIfDone();
 }