[Quota][Clean up] Simplify usage aggregator in ClientUsageTracker

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 35 matching lines @@
   bool IsWorking() const {
     return global_usage_callbacks_.HasCallbacks() ||
            host_usage_callbacks_.HasAnyCallbacks();
   }
 
   void SetUsageCacheEnabled(QuotaClient::ID client_id,
                             const GURL& origin,
                             bool enabled);
 
  private:
-  struct TrackingInfo {
-    TrackingInfo() : pending_clients(0), usage(0), unlimited_usage(0) {}
+  struct AccumulateInfo {
+    AccumulateInfo() : pending_clients(0), usage(0), unlimited_usage(0) {}
     int pending_clients;
     int64 usage;
     int64 unlimited_usage;
   };
 
   typedef std::map<QuotaClient::ID, ClientUsageTracker*> ClientTrackerMap;
 
   friend class ClientUsageTracker;
-  void DidGetClientGlobalUsage(TrackingInfo* info,
-                               int64 usage,
-                               int64 unlimited_usage);
-  void DidGetClientHostUsage(TrackingInfo* info,
-                             const std::string& host,
-                             int64 usage);
+  void AccumulateClientGlobalUsage(AccumulateInfo* info,
+                                   int64 usage,
+                                   int64 unlimited_usage);
+  void AccumulateClientHostUsage(AccumulateInfo* info,
+                                 const std::string& host,
+                                 int64 usage);
 
   const StorageType type_;
   ClientTrackerMap client_tracker_map_;
 
   GlobalUsageCallbackQueue global_usage_callbacks_;
   HostUsageCallbackMap host_usage_callbacks_;
 
   base::WeakPtrFactory<UsageTracker> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(UsageTracker);
 };
 
 // This class holds per-client usage tracking information and caches per-host
 // usage data.  An instance of this class is created per client.
 class ClientUsageTracker : public SpecialStoragePolicy::Observer,
                            public base::NonThreadSafe,
                            public base::SupportsWeakPtr<ClientUsageTracker> {
  public:
+  typedef base::Callback<void(int64 cached_usage,
+                              int64 non_cached_usage)> HostUsageAccumulator;
+  typedef base::Callback<void(const GURL& origin,
+                              int64 usage)> OriginUsageAccumulator;
+
   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 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;
   int64 GetCachedOriginsUsage(const std::set<GURL>& origins,
                               std::vector<GURL>* origins_not_in_cache);
   bool IsUsageCacheEnabledForOrigin(const GURL& origin) const;
   void SetUsageCacheEnabled(const GURL& origin, bool enabled);
 
  private:
+  typedef CallbackQueueMap<HostUsageAccumulator, std::string,
+                           Tuple2<int64, int64> > HostUsageAccumulatorMap;
+
   typedef std::set<std::string> HostSet;
   typedef std::map<GURL, int64> UsageMap;
   typedef std::map<std::string, UsageMap> HostUsageMap;
   typedef std::map<std::string, std::set<GURL> > OriginSetByHost;
 
-  class GatherUsageTaskBase;
-  class GatherGlobalUsageTask;
-  class GatherHostUsageTask;
+  struct AccumulateInfo {
+    int pending_jobs;
+    int64 cached_usage;
+    int64 non_cached_usage;
+
+    AccumulateInfo() : pending_jobs(0), cached_usage(0), non_cached_usage(0) {}
+  };
+
+  void DidGetOriginsForGlobalUsage(const GlobalUsageCallback& callback,
+                                   const std::set<GURL>& origins,
+                                   StorageType type);
+  void AccumulateHostUsage(AccumulateInfo* info,
+                           const GlobalUsageCallback& callback,
+                           int64 cached_usage,
+                           int64 non_cached_usage);
+
+  void DidGetOriginsForHostUsage(const std::string& host,
+                                 const std::set<GURL>& origins,
+                                 StorageType type);
+
+  void GetUsageForOrigins(const std::string& host,
+                          const std::set<GURL>& origins);
+  void AccumulateOriginUsage(AccumulateInfo* info,
+                             const std::string& host,
+                             const GURL& origin,
+                             int64 usage);
 
   // 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(
-      int64 global_usage,
-      int64 non_cached_global_usage,
-      const std::map<std::string, int64>& non_cached_usage_by_host);
-  void GatherHostUsageComplete(const std::string& host, int64 host_usage);
 
   int64 GetCachedHostUsage(const std::string& host) const;
   int64 GetCachedGlobalUnlimitedUsage();
   bool GetCachedOriginUsage(const GURL& origin, int64* usage) const;
 
   // SpecialStoragePolicy::Observer overrides
   virtual void OnGranted(const GURL& origin, int change_flags) OVERRIDE;
   virtual void OnRevoked(const GURL& origin, int change_flags) OVERRIDE;
   virtual void OnCleared() OVERRIDE;
 
-  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_;
   HostSet cached_hosts_;
   HostUsageMap cached_usage_by_host_;
 
   OriginSetByHost non_cached_origins_by_host_;
 
-  GatherGlobalUsageTask* global_usage_task_;
   GlobalUsageCallbackQueue global_usage_callback_;
-  std::map<std::string, GatherHostUsageTask*> host_usage_tasks_;
-  HostUsageCallbackMap host_usage_callbacks_;
+  HostUsageAccumulatorMap host_usage_accumulators_;
 
   scoped_refptr<SpecialStoragePolicy> special_storage_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientUsageTracker);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_USAGE_TRACKER_H_