Merged HostQuotaCallback into QuotaCallback

webkit/quota/quota_manager_unittest.cc

Index: webkit/quota/quota_manager_unittest.cc
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index 11ddd17d276c081b7eeaab1f26bdf0ba062dc53e..99e06368aab54403a2fe70d8c75370b717ca682c 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -108,7 +108,7 @@ class QuotaManagerTest : public testing::Test {
     quota_ = -1;
     quota_manager_->GetTemporaryGlobalQuota(
         base::Bind(&QuotaManagerTest::DidGetQuota,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), quota::kStorageTypeTemporary));
   }
 
   void SetTemporaryGlobalQuota(int64 new_quota) {
@@ -117,7 +117,7 @@ class QuotaManagerTest : public testing::Test {
     quota_manager_->SetTemporaryGlobalOverrideQuota(
         new_quota,
         base::Bind(&QuotaManagerTest::DidGetQuota,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), quota::kStorageTypeTemporary));
   }
 
   void GetPersistentHostQuota(const std::string& host) {
@@ -295,8 +295,8 @@ class QuotaManagerTest : public testing::Test {
     quota_ = quota;
   }
 
-  void DidGetQuota(QuotaStatusCode status,
-                   StorageType type,
+  void DidGetQuota(StorageType type,
+                   QuotaStatusCode status,
                    int64 quota) {
     quota_status_ = status;
     type_ = type;