[Quota] Wire up limited origin usage retrieving.

webkit/browser/quota/usage_tracker.h

 // Copyright 2013 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_BROWSER_QUOTA_USAGE_TRACKER_H_
 #define WEBKIT_BROWSER_QUOTA_USAGE_TRACKER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 47 matching lines @@
   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 AccumulateClientGlobalLimitedUsage(AccumulateInfo* info,
+                                          int64 limited_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_;
 
+  UsageCallbackQueue global_limited_usage_callbacks_;
   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(int64 limited_usage,
+                              int64 unlimited_usage)> HostUsageAccumulator;
   typedef base::Callback<void(const GURL& origin,
                               int64 usage)> OriginUsageAccumulator;
   typedef std::map<std::string, std::set<GURL> > OriginSetByHost;
 
   ClientUsageTracker(UsageTracker* tracker,
                      QuotaClient* client,
                      StorageType type,
                      SpecialStoragePolicy* special_storage_policy);
   virtual ~ClientUsageTracker();
 
+  void GetGlobalLimitedUsage(const UsageCallback& callback);
   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;
 
   struct AccumulateInfo {
     int pending_jobs;
-    int64 cached_usage;
-    int64 non_cached_usage;
+    int64 limited_usage;
+    int64 unlimited_usage;
 
-    AccumulateInfo() : pending_jobs(0), cached_usage(0), non_cached_usage(0) {}
+    AccumulateInfo()
+        : pending_jobs(0), limited_usage(0), unlimited_usage(0) {}
   };
 
+  void AccumulateLimitedOriginUsage(AccumulateInfo* info,
+                                    const UsageCallback& callback,
+                                    int64 usage);
   void DidGetOriginsForGlobalUsage(const GlobalUsageCallback& callback,
                                    const std::set<GURL>& origins);
   void AccumulateHostUsage(AccumulateInfo* info,
                            const GlobalUsageCallback& callback,
-                           int64 cached_usage,
-                           int64 non_cached_usage);
+                           int64 limited_usage,
+                           int64 unlimited_usage);
 
   void DidGetOriginsForHostUsage(const std::string& host,
                                  const std::set<GURL>& origins);
 
   void GetUsageForOrigins(const std::string& host,
                           const std::set<GURL>& origins);
   void AccumulateOriginUsage(AccumulateInfo* info,
                              const std::string& host,
                              const GURL& origin,
                              int64 usage);
@@ skipping 31 matching lines @@
   HostUsageAccumulatorMap host_usage_accumulators_;
 
   scoped_refptr<SpecialStoragePolicy> special_storage_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientUsageTracker);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_BROWSER_QUOTA_USAGE_TRACKER_H_