Cleanup: quota::HostUsageCallback and quota::HostQuotaCallback do not need to pass host and type as…

webkit/quota/quota_types.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_QUOTA_TYPES_H_
 #define WEBKIT_QUOTA_QUOTA_TYPES_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 30 matching lines @@
 
 // Common callback types that are used throughout in the quota module.
 typedef base::Callback<void(StorageType status,
                             int64 usage,
                             int64 unlimited_usage)> GlobalUsageCallback;
 typedef base::Callback<void(QuotaStatusCode status,
                             StorageType type,
                             int64 quota)> QuotaCallback;
 // TODO(kinuko,nhiroki): HostUsageCallback could be probably replaced with
 // simple Callback<void(int64)> callback by binding host and type with Bind.
-typedef base::Callback<void(const std::string& host,
-                            StorageType type,
-                            int64 host_usage)> HostUsageCallback;
+typedef base::Callback<void(int64 usage)> UsageCallback;
 typedef base::Callback<void(QuotaStatusCode status,
                             const std::string& host,
                             StorageType type,
                             int64 quota)> HostQuotaCallback;
 typedef base::Callback<void(QuotaStatusCode, int64)> AvailableSpaceCallback;
 typedef base::Callback<void(QuotaStatusCode)> StatusCallback;
 typedef base::Callback<void(const std::set<GURL>& origins,
                             StorageType type)> GetOriginsCallback;
 typedef base::Callback<void(const UsageInfoEntries&)> GetUsageInfoCallback;
 
@@ skipping 132 matching lines @@
   // from the map.
   void Run(const KEY& key, ARG1 arg1, ARG2 arg2) {
     if (!this->HasCallbacks(key))
       return;
     Queue& queue = this->callback_map_[key];
     queue.Run(arg1, arg2);
     this->callback_map_.erase(key);
   }
 };
 
-template <typename CallbackType3, typename KEY,
-          typename ARG1, typename ARG2, typename ARG3>
-class CallbackQueueMap3
-    : public CallbackQueueMapBase<CallbackType3,
-                                  CallbackQueue3<CallbackType3,
-                                                 ARG1, ARG2, ARG3>,
-                                  KEY> {
- public:
-  typedef typename CallbackQueueMapBase<
-      CallbackType3,
-      CallbackQueue3<CallbackType3, ARG1, ARG2, ARG3>,
-      KEY>::iterator iterator;
-  typedef CallbackQueue3<CallbackType3, ARG1, ARG2, ARG3> Queue;
-
-  // Runs the callbacks added for the given |key| and clears the key
-  // from the map.
-  void Run(const KEY& key, ARG1 arg1, ARG2 arg2, ARG3 arg3) {
-    if (!this->HasCallbacks(key))
-      return;
-    Queue& queue = this->callback_map_[key];
-    queue.Run(arg1, arg2, arg3);
-    this->callback_map_.erase(key);
-  }
-};
-
-typedef CallbackQueueMap3<HostUsageCallback, std::string,
-                          const std::string&,
-                          StorageType, int64> HostUsageCallbackMap;
+typedef CallbackQueueMap1<UsageCallback, std::string, int64>
+    HostUsageCallbackMap;
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_TYPES_H_