Use base::Callback in Quota related code.

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 <utility>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/quota/quota_client.h"
 
 namespace quota {
@@ skipping 22 matching lines @@
 
   void AddOriginToErrorSet(const GURL& origin_url, StorageType type);
 
   base::Time IncrementMockTime();
 
   // QuotaClient methods.
   virtual QuotaClient::ID id() const OVERRIDE;
   virtual void OnQuotaManagerDestroyed() OVERRIDE;
   virtual void GetOriginUsage(const GURL& origin_url,
                               StorageType type,
-                              GetUsageCallback* callback) OVERRIDE;
+                              GetUsageCallback callback) OVERRIDE;

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

   virtual void GetOriginsForType(StorageType type,
-                                 GetOriginsCallback* callback) OVERRIDE;
+                                 GetOriginsCallback callback) OVERRIDE;

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

   virtual void GetOriginsForHost(StorageType type, const std::string& host,
-                                 GetOriginsCallback* callback) OVERRIDE;
+                                 GetOriginsCallback callback) OVERRIDE;

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
-                                DeletionCallback* callback) OVERRIDE;
+                                DeletionCallback callback) OVERRIDE;

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

 
  private:
   void RunGetOriginUsage(const GURL& origin_url,
                          StorageType type,
-                         GetUsageCallback* callback);
+                         GetUsageCallback callback);

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

   void RunGetOriginsForType(StorageType type,
-                            GetOriginsCallback* callback);
+                            GetOriginsCallback callback);

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

   void RunGetOriginsForHost(StorageType type,
                             const std::string& host,
-                            GetOriginsCallback* callback);
+                            GetOriginsCallback callback);

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

   void RunDeleteOriginData(const GURL& origin_url,
                            StorageType type,
-                           DeletionCallback* callback);
+                           DeletionCallback callback);

[awong, 2011/09/29 18:05:15]

const &.

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

Done.

 
   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_;
 
-  std::set<GetUsageCallback*> usage_callbacks_;
-  std::set<GetOriginsCallback*> origins_callbacks_;
-  std::set<DeletionCallback*> deletion_callbacks_;
-
   int mock_time_counter_;
 
   ScopedRunnableMethodFactory<MockStorageClient> runnable_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MockStorageClient);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_MOCK_STORAGE_CLIENT_H_