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

webkit/quota/quota_manager.cc

Index: webkit/quota/quota_manager.cc
diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc
index 095c24d7f0f0afed701a4d65fccc675a9309d6d7..1b2be0484057b2112269532564c167c142f5d28a 100644
--- a/webkit/quota/quota_manager.cc
+++ b/webkit/quota/quota_manager.cc
@@ -354,10 +354,11 @@ class QuotaManager::UsageAndQuotaDispatcherTask : public QuotaTask {
     return base::Bind(&UsageAndQuotaDispatcherTask::DidGetGlobalUsage,
                       weak_factory_.GetWeakPtr());
   }
-  HostUsageCallback NewWaitableHostUsageCallback() {
+  HostUsageCallback NewWaitableHostUsageCallback(const std::string& host,
+                                                 quota::StorageType type) {
     ++waiting_callbacks_;
     return base::Bind(&UsageAndQuotaDispatcherTask::DidGetHostUsage,
-                      weak_factory_.GetWeakPtr());
+                      weak_factory_.GetWeakPtr(), host, type);

[kinuko, 2012/09/17 19:15:42]

looks like we can call host() and type() here rather than passing them as args
to NewWaitableHostUsageCallback

[calvinlo, 2012/09/18 05:59:18]

Done.

   }
   HostQuotaCallback NewWaitableHostQuotaCallback() {
     ++waiting_callbacks_;
@@ -480,7 +481,7 @@ class QuotaManager::UsageAndQuotaDispatcherTaskForTemporary
     manager()->GetUsageTracker(type())->GetGlobalUsage(
         NewWaitableGlobalUsageCallback());
     manager()->GetUsageTracker(type())->GetHostUsage(
-        host(), NewWaitableHostUsageCallback());
+        host(), NewWaitableHostUsageCallback(host(), type()));
     manager()->GetAvailableSpace(NewWaitableAvailableSpaceCallback());
   }
 
@@ -512,7 +513,7 @@ class QuotaManager::UsageAndQuotaDispatcherTaskForPersistent
  protected:
   virtual void RunBody() OVERRIDE {
     manager()->GetUsageTracker(type())->GetHostUsage(
-        host(), NewWaitableHostUsageCallback());
+        host(), NewWaitableHostUsageCallback(host(), type()));
     manager()->GetPersistentHostQuota(
         host(), NewWaitableHostQuotaCallback());
     manager()->GetAvailableSpace(NewWaitableAvailableSpaceCallback());
@@ -535,7 +536,7 @@ class QuotaManager::UsageAndQuotaDispatcherTaskForSyncable
  protected:
   virtual void RunBody() OVERRIDE {
     manager()->GetUsageTracker(type())->GetHostUsage(
-        host(), NewWaitableHostUsageCallback());
+        host(), NewWaitableHostUsageCallback(host(), type()));
   }
 
   virtual void DispatchCallbacks() OVERRIDE {