BrowsingDataRemover: Enable origin-based deletion for quota-managed data.

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 271 matching lines @@
     // 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_);
     }
   }
 
   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)));
     }
   }
 
@@ skipping 283 matching lines @@
 
 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.
   std::set<GURL>::const_iterator origin;
   for (origin = origins.begin(); origin != origins.end(); ++origin) {
     if (special_storage_policy_->IsStorageProtected(origin->GetOrigin()))
       continue;
+    if (!remove_origin_.is_empty() && remove_origin_ != origin->GetOrigin())
+      continue;
     ++quota_managed_origins_to_delete_count_;
     quota_manager_->DeleteOriginData(
         origin->GetOrigin(), type,
         BrowsingDataRemover::GenerateQuotaClientMask(remove_mask_),
         base::Bind(&BrowsingDataRemover::OnQuotaManagedOriginDeletion,
                    base::Unretained(this)));
   }
 
   --quota_managed_storage_types_to_delete_count_;
   CheckQuotaManagedDataDeletionStatus();
@@ skipping 71 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();
 }