Merged HostQuotaCallback into QuotaCallback

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 25 matching lines @@
   kQuotaStatusUnknown = -1,
 };
 
 struct UsageInfo;
 typedef std::vector<UsageInfo> UsageInfoEntries;
 
 // 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;
+typedef base::Callback<void(QuotaStatusCode status, int64 quota)> QuotaCallback;
 typedef base::Callback<void(int64 usage)> UsageCallback;
-// TODO(calvinlo): Merge HostQuotaCallback and QuotaCallback
-typedef base::Callback<void(QuotaStatusCode status,
-                            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;
 
 // Simple template wrapper for a callback queue.
 template <typename CallbackType>
 class CallbackQueueBase {
  public:
@@ skipping 134 matching lines @@
     this->callback_map_.erase(key);
   }
 };
 
 typedef CallbackQueueMap1<UsageCallback, std::string, int64>
     HostUsageCallbackMap;
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_TYPES_H_