[Quota][Clean up] Drop StorageType in GlobalUsageCallback

webkit/quota/usage_tracker_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/message_loop.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/usage_tracker.h"
 
 namespace quota {
 
 namespace {
 
 void DidGetGlobalUsage(bool* done,
-                       StorageType* type_out,
                        int64* usage_out,
                        int64* unlimited_usage_out,
-                       StorageType type,
                        int64 usage,
                        int64 unlimited_usage) {
   EXPECT_FALSE(*done);
   *done = true;
-  *type_out = type;
   *usage_out = usage;
   *unlimited_usage_out = unlimited_usage;
 }
 
 void DidGetUsage(bool* done,
                  int64* usage_out,
                  int64 usage) {
   EXPECT_FALSE(*done);
   *done = true;
   *usage_out = usage;
@@ skipping 98 matching lines @@
     usage_tracker_.UpdateUsageCache(quota_client_.id(), origin, delta);
     message_loop_.RunUntilIdle();
   }
 
   void UpdateUsageWithoutNotification(const GURL& origin, int64 delta) {
     quota_client_.UpdateUsage(origin, delta);
   }
 
   void GetGlobalUsage(int64* usage, int64* unlimited_usage) {
     bool done = false;
-    StorageType type = kStorageTypeUnknown;
     usage_tracker_.GetGlobalUsage(base::Bind(
         &DidGetGlobalUsage,
-        &done, &type, usage, unlimited_usage));
+        &done, usage, unlimited_usage));
     message_loop_.RunUntilIdle();
 
     EXPECT_TRUE(done);
-    EXPECT_EQ(kStorageTypeTemporary, type);
   }
 
   void GetHostUsage(const std::string& host, int64* usage) {
     bool done = false;
     usage_tracker_.GetHostUsage(host, base::Bind(&DidGetUsage, &done, usage));
     message_loop_.RunUntilIdle();
 
     EXPECT_TRUE(done);
   }
 
@@ skipping 111 matching lines @@
   UpdateUsage(origin, 100);
 
   GetGlobalUsage(&usage, &unlimited_usage);
   GetHostUsage(host, &host_usage);
   EXPECT_EQ(500, usage);
   EXPECT_EQ(0, unlimited_usage);
   EXPECT_EQ(500, host_usage);
 }
 
 }  // namespace quota