QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_quota_manager.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "webkit/quota/mock_quota_manager.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 56 matching lines @@
 
  private:
   StatusCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteOriginDataTask);
 };
 
 MockQuotaManager::OriginInfo::OriginInfo(
     const GURL& origin,
     StorageType type,
+    int quota_client_mask,
     base::Time modified)
     : origin(origin),
       type(type),
+      quota_client_mask(quota_client_mask),
       modified(modified) {
 }
 
 MockQuotaManager::OriginInfo::~OriginInfo() {}
 
 MockQuotaManager::MockQuotaManager(bool is_incognito,
     const FilePath& profile_path, base::MessageLoopProxy* io_thread,
     base::MessageLoopProxy* db_thread,
     SpecialStoragePolicy* special_storage_policy)
     : QuotaManager(is_incognito, profile_path, io_thread, db_thread,
         special_storage_policy) {
 }
 
 MockQuotaManager::~MockQuotaManager() {}
 
 bool MockQuotaManager::AddOrigin(const GURL& origin, StorageType type,
-    base::Time modified) {
-  origins_.push_back(OriginInfo(origin, type, modified));
+    int quota_client_mask, base::Time modified) {
+  origins_.push_back(OriginInfo(origin, type, quota_client_mask, modified));
   return true;
 }
 
 bool MockQuotaManager::OriginHasData(const GURL& origin,
-    StorageType type) const {
+    StorageType type, QuotaClient::ID quota_client) const {
   for (std::vector<OriginInfo>::const_iterator current = origins_.begin();
        current != origins_.end();
        ++current) {
-    if (current->origin == origin && current->type == type)
+    if (current->origin == origin && current->type == type &&
+        current->quota_client_mask & quota_client)

[kinuko, 2012/01/22 18:35:31]

style-nit: to improve readability can we put each condition in different line?

current->origin == origin &&
current->type == type &&
current->quota_client_mask & quota_client

[Mike West, 2012/01/22 20:54:38]

Done.

       return true;
   }
   return false;
 }
 
 void MockQuotaManager::GetOriginsModifiedSince(
     StorageType type,
     base::Time modified_since,
     const GetOriginsCallback& callback) {
   std::set<GURL> origins_to_return;
   for (std::vector<OriginInfo>::const_iterator current = origins_.begin();
        current != origins_.end();
        ++current) {
     if (current->type == type && current->modified >= modified_since)
       origins_to_return.insert(current->origin);
   }
   make_scoped_refptr(new GetModifiedSinceTask(this, origins_to_return, type,
       callback))->Start();
 }
 
 void MockQuotaManager::DeleteOriginData(const GURL& origin, StorageType type,

[kinuko, 2012/01/22 18:35:31]

style-nit: please break the line after '(' and align all the args with 4 spaces
for the sake of style consistency (here and above)

[Mike West, 2012/01/22 20:54:38]

Done.

-                                        const StatusCallback& callback) {
+    int quota_client_mask, const StatusCallback& callback) {
   for (std::vector<OriginInfo>::iterator current = origins_.begin();
        current != origins_.end();
        ++current) {
     if (current->origin == origin && current->type == type) {
-      origins_.erase(current);
+      // Modify the mask: if it's 0 after "deletion", remove the origin.
+      current->quota_client_mask &= ~quota_client_mask;
+      if (current->quota_client_mask == 0)
+        origins_.erase(current);
       break;
     }
   }
   make_scoped_refptr(new DeleteOriginDataTask(this, callback))->Start();
 }
 
 }  // namespace quota