QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_quota_manager.h

-// 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.
 
 #ifndef WEBKIT_QUOTA_MOCK_QUOTA_MANAGER_H_
 #define WEBKIT_QUOTA_MOCK_QUOTA_MANAGER_H_
 #pragma once
 
 #include <vector>
 #include <string>
 
@@ skipping 12 matching lines @@
 // GetOriginsModifiedSince. Neither GetOriginsModifiedSince nor DeleteOriginData
 // touches the actual origin data stored in the profile.
 class MockQuotaManager : public QuotaManager {
  public:
   // Contains the essential bits of information about an origin that the
   // MockQuotaManager needs to understand: the origin itself, the StorageType,
   // and its modification time.
   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;
   };
 
   MockQuotaManager(bool is_incognito,
                    const FilePath& profile_path,
                    base::MessageLoopProxy* io_thread,
                    base::MessageLoopProxy* db_thread,
                    SpecialStoragePolicy* special_storage_policy);
 
   virtual ~MockQuotaManager();
 
   // 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
   // method will only search through the origins added explicitly via AddOrigin.
   virtual void GetOriginsModifiedSince(
       StorageType type,
       base::Time modified_since,
       const GetOriginsCallback& callback) OVERRIDE;
 
   // Removes an origin from the canned list of origins, but doesn't touch
   // anything on disk.
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
+                                int quota_client_mask,
                                 const StatusCallback& callback) OVERRIDE;
 
  private:
   class GetModifiedSinceTask;
   class DeleteOriginDataTask;
 
   // The list of stored origins that have been added via AddOrigin.
   std::vector<OriginInfo> origins_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuotaManager);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_MOCK_QUOTA_MANAGER_H_