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

webkit/quota/usage_tracker.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_USAGE_TRACKER_H_
 #define WEBKIT_QUOTA_USAGE_TRACKER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 19 matching lines @@
 class UsageTracker : public QuotaTaskObserver {
  public:
   UsageTracker(const QuotaClientList& clients, StorageType type,
                SpecialStoragePolicy* special_storage_policy);
   virtual ~UsageTracker();
 
   StorageType type() const { return type_; }
   ClientUsageTracker* GetClientTracker(QuotaClient::ID client_id);
 
   void GetGlobalUsage(const GlobalUsageCallback& callback);
-  void GetHostUsage(const std::string& host, const HostUsageCallback& callback);
+  void GetHostUsage(const std::string& host, const UsageCallback& callback);
   void UpdateUsageCache(QuotaClient::ID client_id,
                         const GURL& origin,
                         int64 delta);
   void GetCachedHostsUsage(std::map<std::string, int64>* host_usage) const;
   void GetCachedOrigins(std::set<GURL>* origins) const;
   bool IsWorking() const {
     return global_usage_callbacks_.HasCallbacks() ||
            host_usage_callbacks_.HasAnyCallbacks();
   }
 
@@ skipping 32 matching lines @@
                            public base::NonThreadSafe,
                            public base::SupportsWeakPtr<ClientUsageTracker> {
  public:
   ClientUsageTracker(UsageTracker* tracker,
                      QuotaClient* client,
                      StorageType type,
                      SpecialStoragePolicy* special_storage_policy);
   virtual ~ClientUsageTracker();
 
   void GetGlobalUsage(const GlobalUsageCallback& callback);
-  void GetHostUsage(const std::string& host, const HostUsageCallback& callback);
+  void GetHostUsage(const std::string& host, const UsageCallback& callback);
   void UpdateUsageCache(const GURL& origin, int64 delta);
   void GetCachedHostsUsage(std::map<std::string, int64>* host_usage) const;
   void GetCachedOrigins(std::set<GURL>* origins) const;
 
  private:
   typedef std::set<std::string> HostSet;
   typedef std::map<GURL, int64> UsageMap;
   typedef std::map<std::string, UsageMap> HostUsageMap;
 
   class GatherUsageTaskBase;
   class GatherGlobalUsageTask;
   class GatherHostUsageTask;
 
   // Methods used by our GatherUsage tasks, as a task makes progress
   // origins and hosts are added incrementally to the cache.
   void AddCachedOrigin(const GURL& origin, int64 usage);
   void AddCachedHost(const std::string& host);
   void GatherGlobalUsageComplete();
   void GatherHostUsageComplete(const std::string& host);
 
   int64 GetCachedHostUsage(const std::string& host) const;
   int64 GetCachedGlobalUnlimitedUsage();
   virtual void OnSpecialStoragePolicyChanged() OVERRIDE;
-  void NoopHostUsageCallback(
-    const std::string& host,  StorageType type, int64 usage);
+  void NoopHostUsageCallback(int64 usage);
   bool IsStorageUnlimited(const GURL& origin) const;
 
   UsageTracker* tracker_;
   QuotaClient* client_;
   const StorageType type_;
 
   int64 global_usage_;
   int64 global_unlimited_usage_;
   bool global_usage_retrieved_;
   bool global_unlimited_usage_is_valid_;
   HostSet cached_hosts_;
   HostUsageMap cached_usage_;
 
   GatherGlobalUsageTask* global_usage_task_;
   GlobalUsageCallbackQueue global_usage_callback_;
   std::map<std::string, GatherHostUsageTask*> host_usage_tasks_;
   HostUsageCallbackMap host_usage_callbacks_;
 
   scoped_refptr<SpecialStoragePolicy> special_storage_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientUsageTracker);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_USAGE_TRACKER_H_