Merged HostQuotaCallback into QuotaCallback

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 90 matching lines @@
     quota_manager_->GetUsageAndQuota(
         origin, type, base::Bind(&QuotaManagerTest::DidGetUsageAndQuota,
                                  weak_factory_.GetWeakPtr()));
   }
 
   void GetTemporaryGlobalQuota() {
     quota_status_ = kQuotaStatusUnknown;
     quota_ = -1;
     quota_manager_->GetTemporaryGlobalQuota(
         base::Bind(&QuotaManagerTest::DidGetQuota,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), quota::kStorageTypeTemporary));
   }
 
   void SetTemporaryGlobalQuota(int64 new_quota) {
     quota_status_ = kQuotaStatusUnknown;
     quota_ = -1;
     quota_manager_->SetTemporaryGlobalOverrideQuota(
         new_quota,
         base::Bind(&QuotaManagerTest::DidGetQuota,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(), quota::kStorageTypeTemporary));
   }
 
   void GetPersistentHostQuota(const std::string& host) {
     quota_status_ = kQuotaStatusUnknown;
     host_.clear();
     type_ = kStorageTypeUnknown;
     quota_ = -1;
     quota_manager_->GetPersistentHostQuota(
         host,
         base::Bind(&QuotaManagerTest::DidGetHostQuota,
@@ skipping 157 matching lines @@
   void DidGetUsageInfo(const UsageInfoEntries& entries) {
     usage_info_.insert(usage_info_.begin(), entries.begin(), entries.end());
   }
 
   void DidGetUsageAndQuota(QuotaStatusCode status, int64 usage, int64 quota) {
     quota_status_ = status;
     usage_ = usage;
     quota_ = quota;
   }
 
-  void DidGetQuota(QuotaStatusCode status,
-                   StorageType type,
+  void DidGetQuota(StorageType type,
+                   QuotaStatusCode status,
                    int64 quota) {
     quota_status_ = status;
     type_ = type;
     quota_ = quota;
   }
 
   void DidGetAvailableSpace(QuotaStatusCode status, int64 available_space) {
     quota_status_ = status;
     available_space_ = available_space;
   }
@@ skipping 1736 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