QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_storage_client.h

 // 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.
 
 #ifndef WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_
 #define WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 12 matching lines @@
 struct MockOriginData {
   const char* origin;
   StorageType type;
   int64 usage;
 };
 
 // Mock storage class for testing.
 class MockStorageClient : public QuotaClient {
  public:
   MockStorageClient(QuotaManagerProxy* quota_manager_proxy,
-                    const MockOriginData* mock_data, size_t mock_data_size);
+                    const MockOriginData* mock_data,
+                    size_t mock_data_size);
+  MockStorageClient(QuotaManagerProxy* quota_manager_proxy,
+                    const MockOriginData* mock_data,
+                    QuotaClient::ID id,
+                    size_t mock_data_size);
   virtual ~MockStorageClient();
 
   // To add or modify mock data in this client.
   void AddOriginAndNotify(
       const GURL& origin_url, StorageType type, int64 size);
   void ModifyOriginAndNotify(
       const GURL& origin_url, StorageType type, int64 delta);
   void TouchAllOriginsAndNotify();
 
   void AddOriginToErrorSet(const GURL& origin_url, StorageType type);
@@ skipping 20 matching lines @@
                          const GetUsageCallback& callback);
   void RunGetOriginsForType(StorageType type,
                             const GetOriginsCallback& callback);
   void RunGetOriginsForHost(StorageType type,
                             const std::string& host,
                             const GetOriginsCallback& callback);
   void RunDeleteOriginData(const GURL& origin_url,
                            StorageType type,
                            const DeletionCallback& callback);
 
+  void Populate_(const MockOriginData* mock_data, size_t mock_data_size);

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

Why does this method name end with '_'?  (It doesn't look very common in the
chrome codebase?)

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

Probably because I've been writing too much JavaScript recently, where "private"
doesn't exist, but is signified with an underscore. *cough* Fixing that here. :)

+
   scoped_refptr<QuotaManagerProxy> quota_manager_proxy_;
   const ID id_;
 
   typedef std::map<std::pair<GURL, StorageType>, int64> OriginDataMap;
   OriginDataMap origin_data_;
   typedef std::set<std::pair<GURL, StorageType> > ErrorOriginSet;
   ErrorOriginSet error_origins_;
 
   int mock_time_counter_;
 
   base::WeakPtrFactory<MockStorageClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MockStorageClient);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_