QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_quota_manager.h

Index: webkit/quota/mock_quota_manager.h
diff --git a/webkit/quota/mock_quota_manager.h b/webkit/quota/mock_quota_manager.h
index 1f6fb0b1e3ae15c3adaaac28a1a9cba1d9ebefce..a373cfea98975ffac41c017197d70500840c3454 100644
--- a/webkit/quota/mock_quota_manager.h
+++ b/webkit/quota/mock_quota_manager.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -31,11 +31,13 @@ class MockQuotaManager : public QuotaManager {
   struct OriginInfo {
     OriginInfo(const GURL& origin,
                StorageType type,
+               int quota_client_mask,
                base::Time modified);
     ~OriginInfo();
 
     GURL origin;
     StorageType type;
+    int quota_client_mask;
     base::Time modified;
   };
 
@@ -49,12 +51,17 @@ class MockQuotaManager : public QuotaManager {
 
   // Adds an origin to the canned list that will be searched through via
   // GetOriginsModifiedSince.

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

nit: can we also add a brief comment for |quota_client_mask| here and below? 
(That'll help others to modify the code)

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

Done.

-  bool AddOrigin(const GURL& origin, StorageType type, base::Time modified);
+  bool AddOrigin(const GURL& origin,
+                 StorageType type,
+                 int quota_client_mask,
+                 base::Time modified);
 
   // Checks an origin and type against the origins that have been added via
   // AddOrigin and removed via DeleteOriginData. If the origin exists in the
-  // canned list with the proper StorageType, returns true.
-  bool OriginHasData(const GURL& origin, StorageType type) const;
+  // canned list with the proper StorageType and client, returns true.
+  bool OriginHasData(const GURL& origin,
+                     StorageType type,
+                     QuotaClient::ID quota_client) const;
 
   // Overrides QuotaManager's implementation with a canned implementation that
   // allows clients to set up the origin database that should be queried. This
@@ -68,6 +75,7 @@ class MockQuotaManager : public QuotaManager {
   // anything on disk.
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
+                                int quota_client_mask,
                                 const StatusCallback& callback) OVERRIDE;
 
  private: