[Quota][Clean up] Drop StorageType in GlobalUsageCallback

webkit/quota/quota_manager.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 "webkit/quota/quota_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <functional>
 #include <set>
@@ skipping 380 matching lines @@
   }
 
  private:
   void DidGetHostUsage(int64 usage) {
     if (status_ == kQuotaStatusUnknown)
       status_ = kQuotaStatusOk;
     usage_and_quota_.usage = usage;
     CheckCompleted();
   }
 
-  void DidGetGlobalUsage(StorageType type,
-                         int64 usage,
+  void DidGetGlobalUsage(int64 usage,
                          int64 unlimited_usage) {
     if (status_ == kQuotaStatusUnknown)
       status_ = kQuotaStatusOk;
     usage_and_quota_.global_usage = usage;
     usage_and_quota_.global_unlimited_usage = unlimited_usage;
     CheckCompleted();
   }
 
   void DidGetQuota(QuotaStatusCode status, int64 quota) {
     if (status_ == kQuotaStatusUnknown || status_ == kQuotaStatusOk)
@@ skipping 67 matching lines @@
         callback_(callback),
         weak_factory_(this) {
   }
 
  protected:
   virtual void Run() OVERRIDE {
     remaining_trackers_ = 3;
     // This will populate cached hosts and usage info.
     manager()->GetUsageTracker(kStorageTypeTemporary)->GetGlobalUsage(
         base::Bind(&GetUsageInfoTask::DidGetGlobalUsage,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(),
+                   kStorageTypeTemporary));
     manager()->GetUsageTracker(kStorageTypePersistent)->GetGlobalUsage(
         base::Bind(&GetUsageInfoTask::DidGetGlobalUsage,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(),
+                   kStorageTypePersistent));
     manager()->GetUsageTracker(kStorageTypeSyncable)->GetGlobalUsage(
         base::Bind(&GetUsageInfoTask::DidGetGlobalUsage,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(),
+                   kStorageTypeSyncable));
   }
 
   virtual void Completed() OVERRIDE {
     callback_.Run(entries_);
     DeleteSoon();
   }
 
   virtual void Aborted() OVERRIDE {
     callback_.Run(UsageInfoEntries());
     DeleteSoon();
@@ skipping 832 matching lines @@
                  base::Bind(
                      &QuotaManager::DidGetTemporaryGlobalUsageForHistogram,
                      weak_factory_.GetWeakPtr()));
   GetGlobalUsage(kStorageTypePersistent,
                  base::Bind(
                      &QuotaManager::DidGetPersistentGlobalUsageForHistogram,
                      weak_factory_.GetWeakPtr()));
 }
 
 void QuotaManager::DidGetTemporaryGlobalUsageForHistogram(
-    StorageType type,
     int64 usage,
     int64 unlimited_usage) {
   UMA_HISTOGRAM_MBYTES("Quota.GlobalUsageOfTemporaryStorage", usage);
+  StorageType type = kStorageTypeTemporary;
 
   std::set<GURL> origins;
   GetCachedOrigins(type, &origins);

[kinuko, 2013/05/22 10:51:33]

You could simply specify kStorageTypeTemporary here?

[tzik, 2013/05/22 11:33:48]

Done.

 
   size_t num_origins = origins.size();
   size_t protected_origins = 0;
   size_t unlimited_origins = 0;
   CountOriginType(origins, special_storage_policy_,
                   &protected_origins, &unlimited_origins);
 
   UMA_HISTOGRAM_COUNTS("Quota.NumberOfTemporaryStorageOrigins",
                        num_origins);
   UMA_HISTOGRAM_COUNTS("Quota.NumberOfProtectedTemporaryStorageOrigins",
                        protected_origins);
   UMA_HISTOGRAM_COUNTS("Quota.NumberOfUnlimitedTemporaryStorageOrigins",
                        unlimited_origins);
 }
 
 void QuotaManager::DidGetPersistentGlobalUsageForHistogram(
-    StorageType type,
     int64 usage,
     int64 unlimited_usage) {
   UMA_HISTOGRAM_MBYTES("Quota.GlobalUsageOfPersistentStorage", usage);
+  StorageType type = kStorageTypePersistent;
 
   std::set<GURL> origins;
   GetCachedOrigins(type, &origins);

[kinuko, 2013/05/22 10:51:33]

ditto.

[tzik, 2013/05/22 11:33:48]

Done.

 
   size_t num_origins = origins.size();
   size_t protected_origins = 0;
   size_t unlimited_origins = 0;
   CountOriginType(origins, special_storage_policy_,
                   &protected_origins, &unlimited_origins);
 
   UMA_HISTOGRAM_COUNTS("Quota.NumberOfPersistentStorageOrigins",
                        num_origins);
   UMA_HISTOGRAM_COUNTS("Quota.NumberOfProtectedPersistentStorageOrigins",
@@ skipping 287 matching lines @@
 
 QuotaManagerProxy::QuotaManagerProxy(
     QuotaManager* manager, base::SingleThreadTaskRunner* io_thread)
     : manager_(manager), io_thread_(io_thread) {
 }
 
 QuotaManagerProxy::~QuotaManagerProxy() {
 }
 
 }  // namespace quota