Merged HostQuotaCallback into QuotaCallback

chrome/browser/ui/webui/quota_internals_proxy.cc

Index: chrome/browser/ui/webui/quota_internals_proxy.cc
diff --git a/chrome/browser/ui/webui/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals_proxy.cc
index a9c5c09563fa52da847e1ef4fece4a0448a5abaf..8f6c6179a0faf87ebbaea8da6e488d2f5ae70d23 100644
--- a/chrome/browser/ui/webui/quota_internals_proxy.cc
+++ b/chrome/browser/ui/webui/quota_internals_proxy.cc
@@ -38,7 +38,7 @@ void QuotaInternalsProxy::RequestInfo(
 
   quota_manager_->GetTemporaryGlobalQuota(
       base::Bind(&QuotaInternalsProxy::DidGetGlobalQuota,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr(), quota::kStorageTypeTemporary));
 
   quota_manager_->GetGlobalUsage(
       quota::kStorageTypeTemporary,
@@ -93,8 +93,8 @@ void QuotaInternalsProxy::DidGetAvailableSpace(quota::QuotaStatusCode status,
     ReportAvailableSpace(space);
 }
 
-void QuotaInternalsProxy::DidGetGlobalQuota(quota::QuotaStatusCode status,
-                                            quota::StorageType type,
+void QuotaInternalsProxy::DidGetGlobalQuota(quota::StorageType type,
+                                            quota::QuotaStatusCode status,
                                             int64 quota) {
   if (status == quota::kQuotaStatusOk) {
     GlobalStorageInfo info(type);