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

webkit/quota/quota_manager_unittest.cc

 // 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.
 
 #include <set>
 #include <sstream>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 110 matching lines @@
   }
 
   void GetPersistentHostQuota(const std::string& host) {
     quota_status_ = kQuotaStatusUnknown;
     host_.clear();
     type_ = kStorageTypeUnknown;
     quota_ = -1;
     quota_manager_->GetPersistentHostQuota(
         host,
         base::Bind(&QuotaManagerTest::DidGetHostQuota,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), host, type_));
   }
 
   void SetPersistentHostQuota(const std::string& host, int64 new_quota) {
     quota_status_ = kQuotaStatusUnknown;
     host_.clear();
     type_ = kStorageTypeUnknown;
     quota_ = -1;
     quota_manager_->SetPersistentHostQuota(
         host, new_quota,
         base::Bind(&QuotaManagerTest::DidGetHostQuota,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), host, type_));
   }
 
   void GetGlobalUsage(StorageType type) {
     type_ = kStorageTypeUnknown;
     usage_ = -1;
     unlimited_usage_ = -1;
     quota_manager_->GetGlobalUsage(
         type,
         base::Bind(&QuotaManagerTest::DidGetGlobalUsage,
                    weak_factory_.GetWeakPtr()));
   }
 
   void GetHostUsage(const std::string& host, StorageType type) {
     host_.clear();
     type_ = kStorageTypeUnknown;
     usage_ = -1;
     quota_manager_->GetHostUsage(
         host, type,
         base::Bind(&QuotaManagerTest::DidGetHostUsage,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), host, type));
   }
 
   void RunAdditionalUsageAndQuotaTask(const GURL& origin, StorageType type) {
     quota_manager_->GetUsageAndQuota(
         origin, type,
         base::Bind(&QuotaManagerTest::DidGetUsageAndQuotaAdditional,
                    weak_factory_.GetWeakPtr()));
   }
 
   void DeleteClientOriginData(QuotaClient* client,
@@ skipping 128 matching lines @@
     quota_status_ = status;
     type_ = type;
     quota_ = quota;
   }
 
   void DidGetAvailableSpace(QuotaStatusCode status, int64 available_space) {
     quota_status_ = status;
     available_space_ = available_space;
   }
 
-  void DidGetHostQuota(QuotaStatusCode status,
-                       const std::string& host,
+  void DidGetHostQuota(const std::string& host,
                        StorageType type,
+                       QuotaStatusCode status,
                        int64 quota) {
-    quota_status_ = status;
     host_ = host;
     type_ = type;
+    quota_status_ = status;
     quota_ = quota;
   }
 
   void DidGetGlobalUsage(StorageType type, int64 usage,
                          int64 unlimited_usage) {
     type_ = type;
     usage_ = usage;
     unlimited_usage_ = unlimited_usage;
   }
 
@@ skipping 1724 matching lines @@
   EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage());
 
   DeleteHostData("foo.com", kTemp,
       QuotaClient::kDatabase | QuotaClient::kIndexedDatabase);
   MessageLoop::current()->RunAllPending();
   GetHostUsage("foo.com", kTemp);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage());
 }
 }  // namespace quota