QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_quota_manager_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 <set>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/quota/mock_quota_manager.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/mock_storage_client.h"
 
 namespace quota {
 
 const char kTestOrigin1[] = "http://host1:1/";
 const char kTestOrigin2[] = "http://host2:1/";
 const char kTestOrigin3[] = "http://host3:1/";
 
 const GURL kOrigin1(kTestOrigin1);
 const GURL kOrigin2(kTestOrigin2);
 const GURL kOrigin3(kTestOrigin3);
 
+const StorageType kTemp = kStorageTypeTemporary;
+const StorageType kPers = kStorageTypePersistent;
+
+const QuotaClient::ID kClientID1 = QuotaClient::kFileSystem;
+const QuotaClient::ID kClientID2 = QuotaClient::kIndexedDatabase;
+
 class MockQuotaManagerTest : public testing::Test {
  public:
   MockQuotaManagerTest()
     : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       deletion_callback_count_(0) {
   }
 
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     policy_ = new MockSpecialStoragePolicy;
@@ skipping 15 matching lines @@
     manager_->GetOriginsModifiedSince(type, since,
         callback_factory_.NewCallback(
             &MockQuotaManagerTest::GotModifiedOrigins));
   }
 
   void GotModifiedOrigins(const std::set<GURL>& origins, StorageType type) {
     origins_ = origins;
     type_ = type;
   }
 
-  void DeleteOriginData(const GURL& origin, StorageType type) {
-    manager_->DeleteOriginData(origin, type,
+  void DeleteOriginData(const GURL& origin, StorageType type, int mask) {
+    manager_->DeleteOriginData(origin, type, mask,
         callback_factory_.NewCallback(
             &MockQuotaManagerTest::DeletedOriginData));
   }
 
   void DeletedOriginData(QuotaStatusCode status) {
     ++deletion_callback_count_;
     EXPECT_EQ(quota::kQuotaStatusOk, status);
   }
 
   int deletion_callback_count() const {
@@ skipping 20 matching lines @@
 
   int deletion_callback_count_;
 
   std::set<GURL> origins_;
   StorageType type_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuotaManagerTest);
 };
 
 TEST_F(MockQuotaManagerTest, BasicOriginManipulation) {
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kStorageTypeTemporary));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypeTemporary));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kStorageTypePersistent));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypePersistent));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kPers, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID2));
 
-  manager()->AddOrigin(kOrigin1, kStorageTypeTemporary, base::Time::Now());
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kStorageTypeTemporary));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypeTemporary));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kStorageTypePersistent));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypePersistent));
+  manager()->AddOrigin(kOrigin1, kTemp, kClientID1, base::Time::Now());
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kPers, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID2));
 
-  manager()->AddOrigin(kOrigin1, kStorageTypePersistent, base::Time::Now());
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kStorageTypeTemporary));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypeTemporary));
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kStorageTypePersistent));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypePersistent));
+  manager()->AddOrigin(kOrigin1, kPers, kClientID1, base::Time::Now());
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kTemp, kClientID1));
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kPers, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID2));
 
-  manager()->AddOrigin(kOrigin2, kStorageTypeTemporary, base::Time::Now());
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kStorageTypeTemporary));
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin2, kStorageTypeTemporary));
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kStorageTypePersistent));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypePersistent));
+  manager()->AddOrigin(kOrigin2, kTemp, kClientID1 | kClientID2,
+      base::Time::Now());
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kTemp, kClientID1));
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin1, kPers, kClientID2));
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin2, kTemp, kClientID2));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kPers, kClientID2));
 }
 
 TEST_F(MockQuotaManagerTest, OriginDeletion) {
-  manager()->AddOrigin(kOrigin1, kStorageTypeTemporary, base::Time::Now());
-  manager()->AddOrigin(kOrigin2, kStorageTypeTemporary, base::Time::Now());
+  manager()->AddOrigin(kOrigin1, kTemp, kClientID1, base::Time::Now());
+  manager()->AddOrigin(kOrigin2, kTemp, kClientID1,  base::Time::Now());
 
-  DeleteOriginData(kOrigin2, kStorageTypeTemporary);
+  DeleteOriginData(kOrigin2, kTemp, kClientID1);
   MessageLoop::current()->RunAllPending();
 
   EXPECT_EQ(1, deletion_callback_count());
-  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kStorageTypeTemporary));
-  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kStorageTypeTemporary));
+  EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kTemp, kClientID1));
+  EXPECT_FALSE(manager()->OriginHasData(kOrigin2, kTemp, kClientID1));
 }
 
 TEST_F(MockQuotaManagerTest, ModifiedOrigins) {
   base::Time now = base::Time::Now();
   base::Time then = base::Time();
   base::TimeDelta an_hour = base::TimeDelta::FromMilliseconds(3600000);
   base::TimeDelta a_minute = base::TimeDelta::FromMilliseconds(60000);
 
-  GetModifiedOrigins(kStorageTypeTemporary, then);
+  GetModifiedOrigins(kTemp, then);
   MessageLoop::current()->RunAllPending();
   EXPECT_TRUE(origins().empty());
 
-  manager()->AddOrigin(kOrigin1, kStorageTypeTemporary, now - an_hour);
+  manager()->AddOrigin(kOrigin1, kTemp, kClientID1, now - an_hour);
 
-  GetModifiedOrigins(kStorageTypeTemporary, then);
+  GetModifiedOrigins(kTemp, then);
   MessageLoop::current()->RunAllPending();
 
-  EXPECT_EQ(kStorageTypeTemporary, type());
+  EXPECT_EQ(kTemp, type());
   EXPECT_EQ(1UL, origins().size());
   EXPECT_EQ(1UL, origins().count(kOrigin1));
   EXPECT_EQ(0UL, origins().count(kOrigin2));
 
-  manager()->AddOrigin(kOrigin2, kStorageTypeTemporary, now);
+  manager()->AddOrigin(kOrigin2, kTemp, kClientID1, now);
 
-  GetModifiedOrigins(kStorageTypeTemporary, then);
+  GetModifiedOrigins(kTemp, then);
   MessageLoop::current()->RunAllPending();
 
-  EXPECT_EQ(kStorageTypeTemporary, type());
+  EXPECT_EQ(kTemp, type());
   EXPECT_EQ(2UL, origins().size());
   EXPECT_EQ(1UL, origins().count(kOrigin1));
   EXPECT_EQ(1UL, origins().count(kOrigin2));
 
-  GetModifiedOrigins(kStorageTypeTemporary, now - a_minute);
+  GetModifiedOrigins(kTemp, now - a_minute);
   MessageLoop::current()->RunAllPending();
 
-  EXPECT_EQ(kStorageTypeTemporary, type());
+  EXPECT_EQ(kTemp, type());
   EXPECT_EQ(1UL, origins().size());
   EXPECT_EQ(0UL, origins().count(kOrigin1));
   EXPECT_EQ(1UL, origins().count(kOrigin2));
 }
 }  // Namespace quota