Use base::Callback in Quota related code.

webkit/quota/mock_storage_client.h

Index: webkit/quota/mock_storage_client.h
diff --git a/webkit/quota/mock_storage_client.h b/webkit/quota/mock_storage_client.h
index fdc26779612c40f062204a1da36297e355099139..379d17a2464305512a7e2a5c6e5bc27b8fd82a42 100644
--- a/webkit/quota/mock_storage_client.h
+++ b/webkit/quota/mock_storage_client.h
@@ -6,6 +6,7 @@
 #define WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_
 
 #include <map>
+#include <utility>

[awong, 2011/10/03 23:40:16]

alphabetical order.

[tzik, 2011/10/11 04:53:57]

Done.

 #include <set>
 #include <string>
 
@@ -48,27 +49,27 @@ class MockStorageClient : public QuotaClient {
   virtual void OnQuotaManagerDestroyed() OVERRIDE;
   virtual void GetOriginUsage(const GURL& origin_url,
                               StorageType type,
-                              GetUsageCallback* callback) OVERRIDE;
+                              const GetUsageCallback& callback) OVERRIDE;
   virtual void GetOriginsForType(StorageType type,
-                                 GetOriginsCallback* callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) OVERRIDE;
   virtual void GetOriginsForHost(StorageType type, const std::string& host,
-                                 GetOriginsCallback* callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) OVERRIDE;
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
-                                DeletionCallback* callback) OVERRIDE;
+                                const DeletionCallback& callback) OVERRIDE;
 
  private:
   void RunGetOriginUsage(const GURL& origin_url,
                          StorageType type,
-                         GetUsageCallback* callback);
+                         const GetUsageCallback& callback);
   void RunGetOriginsForType(StorageType type,
-                            GetOriginsCallback* callback);
+                            const GetOriginsCallback& callback);
   void RunGetOriginsForHost(StorageType type,
                             const std::string& host,
-                            GetOriginsCallback* callback);
+                            const GetOriginsCallback& callback);
   void RunDeleteOriginData(const GURL& origin_url,
                            StorageType type,
-                           DeletionCallback* callback);
+                           const DeletionCallback& callback);
 
   scoped_refptr<QuotaManagerProxy> quota_manager_proxy_;
   const ID id_;
@@ -78,10 +79,6 @@ class MockStorageClient : public QuotaClient {
   typedef std::set<std::pair<GURL, StorageType> > ErrorOriginSet;
   ErrorOriginSet error_origins_;
 
-  std::set<GetUsageCallback*> usage_callbacks_;
-  std::set<GetOriginsCallback*> origins_callbacks_;
-  std::set<DeletionCallback*> deletion_callbacks_;
-
   int mock_time_counter_;
 
   ScopedRunnableMethodFactory<MockStorageClient> runnable_factory_;