Use base::Callback in Quota related code.

webkit/database/database_quota_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_DATABASE_DATABASE_QUOTA_CLIENT_H_
 #define WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_
 
 #include <set>
 #include <string>
 
@@ skipping 16 matching lines @@
   DatabaseQuotaClient(
       base::MessageLoopProxy* tracker_thread,
       DatabaseTracker* tracker);
   virtual ~DatabaseQuotaClient();
 
   // QuotaClient method overrides
   virtual ID id() const OVERRIDE;
   virtual void OnQuotaManagerDestroyed();
   virtual void GetOriginUsage(const GURL& origin_url,
                               quota::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(quota::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(quota::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,
                                 quota::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:
   class HelperTask;
   class GetOriginUsageTask;
   class GetOriginsTaskBase;
   class GetAllOriginsTask;
   class GetOriginsForHostTask;
   class DeleteOriginTask;
 
   typedef quota::CallbackQueueMap1
-      <GetUsageCallback*,
+      <GetUsageCallback,
        GURL,  // origin
        int64
       > UsageForOriginCallbackMap;
   typedef quota::CallbackQueue2
-      <GetOriginsCallback*,
+      <GetOriginsCallback,
        const std::set<GURL>&,
        quota::StorageType
       > OriginsForTypeCallbackQueue;
   typedef quota::CallbackQueueMap2
-      <GetOriginsCallback*,
+      <GetOriginsCallback,
        std::string,  // host
        const std::set<GURL>&,
        quota::StorageType
       > OriginsForHostCallbackMap;
 
   void DidGetOriginUsage(const GURL& origin_url, int64 usage);
   void DidGetAllOrigins(const std::set<GURL>& origins, quota::StorageType type);
   void DidGetOriginsForHost(const std::string& host,
                             const std::set<GURL>& origins,
                             quota::StorageType type);
 
   scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
   scoped_refptr<DatabaseTracker> db_tracker_;  // only used on its thread
   UsageForOriginCallbackMap usage_for_origin_callbacks_;
   OriginsForTypeCallbackQueue origins_for_type_callbacks_;
   OriginsForHostCallbackMap origins_for_host_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(DatabaseQuotaClient);
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_DATABASE_DATABASE_QUOTA_CLIENT_H_