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

webkit/quota/mock_quota_manager_unittest.cc

Index: webkit/quota/mock_quota_manager_unittest.cc
diff --git a/webkit/quota/mock_quota_manager_unittest.cc b/webkit/quota/mock_quota_manager_unittest.cc
index ee6a10129cde08ade2a0afc17ab22518dad1eb7e..2a4b7ef5f788a81378fec4676f04b567ef465494 100644
--- a/webkit/quota/mock_quota_manager_unittest.cc
+++ b/webkit/quota/mock_quota_manager_unittest.cc
@@ -56,8 +56,9 @@ class MockQuotaManagerTest : public testing::Test {
             &MockQuotaManagerTest::GotModifiedOrigins));
   }
 
-  void GotModifiedOrigins(const std::set<GURL>& origins) {
+  void GotModifiedOrigins(const std::set<GURL>& origins, StorageType type) {
     origins_ = origins;
+    type_ = type;
   }
 
   void DeleteOriginData(const GURL& origin, StorageType type) {
@@ -83,6 +84,10 @@ class MockQuotaManagerTest : public testing::Test {
     return origins_;
   }
 
+  const StorageType GetType() {
+    return type_;
+  }
+
  private:
   ScopedTempDir data_dir_;
   base::ScopedCallbackFactory<MockQuotaManagerTest> callback_factory_;
@@ -92,6 +97,7 @@ class MockQuotaManagerTest : public testing::Test {
   int deletion_callback_count_;
 
   std::set<GURL> origins_;
+  StorageType type_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuotaManagerTest);
 };
@@ -148,6 +154,7 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) {
   GetModifiedOrigins(kStorageTypeTemporary, then);
   MessageLoop::current()->RunAllPending();
 
+  EXPECT_EQ(kStorageTypeTemporary, GetType());
   EXPECT_EQ(1UL, GetOrigins().size());
   EXPECT_EQ(1UL, GetOrigins().count(kOrigin1));
   EXPECT_EQ(0UL, GetOrigins().count(kOrigin2));
@@ -157,6 +164,7 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) {
   GetModifiedOrigins(kStorageTypeTemporary, then);
   MessageLoop::current()->RunAllPending();
 
+  EXPECT_EQ(kStorageTypeTemporary, GetType());
   EXPECT_EQ(2UL, GetOrigins().size());
   EXPECT_EQ(1UL, GetOrigins().count(kOrigin1));
   EXPECT_EQ(1UL, GetOrigins().count(kOrigin2));
@@ -164,6 +172,7 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) {
   GetModifiedOrigins(kStorageTypeTemporary, now - a_minute);
   MessageLoop::current()->RunAllPending();
 
+  EXPECT_EQ(kStorageTypeTemporary, GetType());
   EXPECT_EQ(1UL, GetOrigins().size());
   EXPECT_EQ(0UL, GetOrigins().count(kOrigin1));
   EXPECT_EQ(1UL, GetOrigins().count(kOrigin2));