Quota: Add quota::StorageType to the GetOriginsCallback definition.

content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
@@ skipping 56 matching lines @@
             &IndexedDBQuotaClientTest::OnGetOriginUsageComplete));
     MessageLoop::current()->RunAllPending();
     EXPECT_GT(usage_, -1);
     return usage_;
   }
 
   const std::set<GURL>& GetOriginsForType(
       quota::QuotaClient* client,
       quota::StorageType type) {
     origins_.clear();
+    type_ = quota::kStorageTypeTemporary;
     client->GetOriginsForType(type,
         callback_factory_.NewCallback(
             &IndexedDBQuotaClientTest::OnGetOriginsComplete));
     MessageLoop::current()->RunAllPending();
     return origins_;
   }
 
   const std::set<GURL>& GetOriginsForHost(
       quota::QuotaClient* client,
       quota::StorageType type,
       const std::string& host) {
     origins_.clear();
+    type_ = quota::kStorageTypeTemporary;
     client->GetOriginsForHost(type, host,
         callback_factory_.NewCallback(
             &IndexedDBQuotaClientTest::OnGetOriginsComplete));
     MessageLoop::current()->RunAllPending();
     return origins_;
   }
 
   IndexedDBContext* idb_context() { return idb_context_.get(); }
 
   void SetFileSizeTo(const FilePath& path, int size) {
@@ skipping 10 matching lines @@
     }
     file_path_origin = file_path_origin.Append(FILE_PATH_LITERAL("fake_file"));
     SetFileSizeTo(file_path_origin, size);
   }
 
  private:
   void OnGetOriginUsageComplete(int64 usage) {
     usage_ = usage;
   }
 
-  void OnGetOriginsComplete(const std::set<GURL>& origins) {
+  void OnGetOriginsComplete(const std::set<GURL>& origins,
+      quota::StorageType type) {
     origins_ = origins;
+    type_ = type_;
   }
 
   ScopedTempDir temp_dir_;
   int64 usage_;
   std::set<GURL> origins_;
+  quota::StorageType type_;
   scoped_refptr<IndexedDBContext> idb_context_;
   base::ScopedCallbackFactory<IndexedDBQuotaClientTest> callback_factory_;
   MessageLoop message_loop_;
   BrowserThread webkit_thread_;
 };
 
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginUsage) {
   IndexedDBQuotaClient client(
       base::MessageLoopProxy::CreateForCurrentThread(),
@@ skipping 47 matching lines @@
   EXPECT_TRUE(GetOriginsForType(&client, kTemp).empty());
   EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
 
   AddFakeIndexedDB(kOriginA, 1000);
   std::set<GURL> origins = GetOriginsForType(&client, kTemp);
   EXPECT_EQ(origins.size(), 1ul);
   EXPECT_TRUE(origins.find(kOriginA) != origins.end());
 
   EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
 }