Merged HostQuotaCallback into QuotaCallback

webkit/quota/quota_manager.h

 // Copyright (c) 2012 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_MANAGER_H_
 #define WEBKIT_QUOTA_QUOTA_MANAGER_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 155 matching lines @@
 
   // Called by UI and internal modules.
   void GetAvailableSpace(const AvailableSpaceCallback& callback);
   void GetTemporaryGlobalQuota(const QuotaCallback& callback);
 
   // Ok to call with NULL callback.
   void SetTemporaryGlobalOverrideQuota(int64 new_quota,
                                        const QuotaCallback& callback);
 
   void GetPersistentHostQuota(const std::string& host,
-                              const HostQuotaCallback& callback);
+                              const QuotaCallback& callback);
   void SetPersistentHostQuota(const std::string& host,
                               int64 new_quota,
-                              const HostQuotaCallback& callback);
+                              const QuotaCallback& callback);
   void GetGlobalUsage(StorageType type, const GlobalUsageCallback& callback);
   void GetHostUsage(const std::string& host, StorageType type,
                     const UsageCallback& callback);
 
   void GetStatistics(std::map<std::string, std::string>* statistics);
 
   bool IsStorageUnlimited(const GURL& origin, StorageType type) const;
 
   bool IsInstalledApp(const GURL& origin) const {
     return special_storage_policy_.get() &&
@@ skipping 137 matching lines @@
   virtual void EvictOriginData(
       const GURL& origin,
       StorageType type,
       const EvictOriginDataCallback& callback) OVERRIDE;
   virtual void GetUsageAndQuotaForEviction(
       const GetUsageAndQuotaForEvictionCallback& callback) OVERRIDE;
 
   void DidSetTemporaryGlobalOverrideQuota(const QuotaCallback& callback,
                                           const int64* new_quota,
                                           bool success);
-  void DidGetPersistentHostQuota(const HostQuotaCallback& callback,
+  void DidGetPersistentHostQuota(const QuotaCallback& callback,
                                  const std::string& host,
                                  const int64* quota,
                                  bool success);
   void DidSetPersistentHostQuota(const std::string& host,
-                                 const HostQuotaCallback& callback,
+                                 const QuotaCallback& callback,
                                  const int64* new_quota,
                                  bool success);
   void DidInitialize(int64* temporary_quota_override,
                      int64* desired_available_space,
                      bool success);
   void DidGetLRUOrigin(const GURL* origin,
                        bool success);
   void DidGetInitialTemporaryGlobalQuota(QuotaStatusCode status,
-                                         StorageType type,
                                          int64 quota_unused);
   void DidInitializeTemporaryOriginsInfo(bool success);
   void DidGetAvailableSpace(const AvailableSpaceCallback& callback,
                             int64 space);
   void DidDatabaseWork(bool success);
 
   void DeleteOnCorrectThread() const;
 
   void PostTaskAndReplyWithResultForDBThread(
       const tracked_objects::Location& from_here,
@@ skipping 84 matching lines @@
 
   QuotaManager* manager_;  // only accessed on the io thread
   scoped_refptr<base::SingleThreadTaskRunner> io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerProxy);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_MANAGER_H_