[Quota][Clean up] Drop StorageType in GlobalUsageCallback

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 19 matching lines @@
 enum QuotaLimitType {
   kQuotaLimitTypeUnknown,
   kQuotaLimitTypeLimited,
   kQuotaLimitTypeUnlimited,
 };
 
 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,
+typedef base::Callback<void(int64 usage,
                             int64 unlimited_usage)> GlobalUsageCallback;
 typedef base::Callback<void(QuotaStatusCode status, int64 quota)> QuotaCallback;
 typedef base::Callback<void(int64 usage)> UsageCallback;
 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;
 
 template<typename CallbackType, typename Args>
@@ skipping 23 matching lines @@
          iter != callbacks_.end(); ++iter)
       DispatchToCallback(*iter, args);
     callbacks_.clear();
   }
 
  private:
   std::vector<CallbackType> callbacks_;
 };
 
 typedef CallbackQueue<GlobalUsageCallback,
-                      Tuple3<StorageType, int64, int64> >
+                      Tuple2<int64, int64> >
     GlobalUsageCallbackQueue;
 typedef CallbackQueue<AvailableSpaceCallback,
                       Tuple2<QuotaStatusCode, int64> >
     AvailableSpaceCallbackQueue;
 typedef CallbackQueue<QuotaCallback,
                       Tuple2<QuotaStatusCode, int64> >
     GlobalQuotaCallbackQueue;
 typedef CallbackQueue<base::Closure, Tuple0> ClosureQueue;
 
 template <typename CallbackType, typename Key, typename Args>
@@ skipping 36 matching lines @@
 
 typedef CallbackQueueMap<UsageCallback, std::string, Tuple1<int64> >
     HostUsageCallbackMap;
 typedef CallbackQueueMap<QuotaCallback, std::string,
                          Tuple2<QuotaStatusCode, int64> >
     HostQuotaCallbackMap;
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_TYPES_H_