Refactors DatabaseQuotaClient using base::Callback.

webkit/database/database_quota_client.h

Index: webkit/database/database_quota_client.h
diff --git a/webkit/database/database_quota_client.h b/webkit/database/database_quota_client.h
index ff362390ea1e0a5142efeeeb069726d08b022cdc..f3a613e6031cff41f54da26a2d933382b42f8f7a 100644
--- a/webkit/database/database_quota_client.h
+++ b/webkit/database/database_quota_client.h
@@ -11,7 +11,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "webkit/quota/quota_client.h"
-#include "webkit/quota/quota_task.h"
 #include "webkit/quota/quota_types.h"
 
 namespace webkit_database {
@@ -21,8 +20,7 @@ class DatabaseTracker;
 // A QuotaClient implementation to integrate WebSQLDatabases
 // with the quota  management system. This interface is used
 // on the IO thread by the quota manager.
-class DatabaseQuotaClient : public quota::QuotaClient,
-                            public quota::QuotaTaskObserver {
+class DatabaseQuotaClient : public quota::QuotaClient {
  public:
   DatabaseQuotaClient(
       base::MessageLoopProxy* tracker_thread,
@@ -44,41 +42,8 @@ class DatabaseQuotaClient : public quota::QuotaClient,
                                 quota::StorageType type,
                                 const DeletionCallback& callback) OVERRIDE;
  private:
-  class HelperTask;
-  class GetOriginUsageTask;
-  class GetOriginsTaskBase;
-  class GetAllOriginsTask;
-  class GetOriginsForHostTask;
-  class DeleteOriginTask;
-
-  typedef quota::CallbackQueueMap1
-      <GetUsageCallback,
-       GURL,  // origin
-       int64
-      > UsageForOriginCallbackMap;
-  typedef quota::CallbackQueue2
-      <GetOriginsCallback,
-       const std::set<GURL>&,
-       quota::StorageType
-      > OriginsForTypeCallbackQueue;
-  typedef quota::CallbackQueueMap2
-      <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);
 };