QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

chrome/browser/browsing_data_remover_unittest.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 "chrome/browser/browsing_data_remover.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 24 matching lines @@
 namespace {
 
 const char kTestkOrigin1[] = "http://host1:1/";
 const char kTestkOrigin2[] = "http://host2:1/";
 const char kTestkOrigin3[] = "http://host3:1/";
 
 const GURL kOrigin1(kTestkOrigin1);
 const GURL kOrigin2(kTestkOrigin2);
 const GURL kOrigin3(kTestkOrigin3);
 
+const quota::StorageType kTemporary = quota::kStorageTypeTemporary;
+const quota::StorageType kPersistent = quota::kStorageTypePersistent;
+
+const quota::QuotaClient::ID kClientFile = quota::QuotaClient::kFileSystem;
+const quota::QuotaClient::ID kClientDB = quota::QuotaClient::kIndexedDatabase;
+
 class BrowsingDataRemoverTester : public BrowsingDataRemover::Observer {
  public:
   BrowsingDataRemoverTester()
       : start_(false),
         already_quit_(false) {}
   virtual ~BrowsingDataRemoverTester() {}
 
   void BlockUntilNotified() {
     if (!already_quit_) {
       DCHECK(!start_);
@@ skipping 140 matching lines @@
     // Set up kOrigin1 with a temporary quota, kOrigin2 with a persistent
     // quota, and kOrigin3 with both. kOrigin1 is modified now, kOrigin2
     // is modified at the beginning of time, and kOrigin3 is modified one day
     // ago.
     PopulateTestQuotaManagedPersistentData(manager);
     PopulateTestQuotaManagedTemporaryData(manager);
   }
 
   void PopulateTestQuotaManagedPersistentData(
       quota::MockQuotaManager* manager) {
-    manager->AddOrigin(kOrigin2, quota::kStorageTypePersistent,
-        base::Time());
-    manager->AddOrigin(kOrigin3, quota::kStorageTypePersistent,
+    manager->AddOrigin(kOrigin2, kPersistent, kClientFile, base::Time());
+    manager->AddOrigin(kOrigin3, kPersistent, kClientFile,
         base::Time::Now() - base::TimeDelta::FromDays(1));
 
-    EXPECT_FALSE(manager->OriginHasData(kOrigin1,
-        quota::kStorageTypePersistent));
-    EXPECT_TRUE(manager->OriginHasData(kOrigin2,
-        quota::kStorageTypePersistent));
-    EXPECT_TRUE(manager->OriginHasData(kOrigin3,
-        quota::kStorageTypePersistent));
+    EXPECT_FALSE(manager->OriginHasData(kOrigin1, kPersistent, kClientFile));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin2, kPersistent, kClientFile));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin3, kPersistent, kClientFile));
   }
 
   void PopulateTestQuotaManagedTemporaryData(quota::MockQuotaManager* manager) {
-    manager->AddOrigin(kOrigin1, quota::kStorageTypeTemporary,
-        base::Time::Now());
-    manager->AddOrigin(kOrigin3, quota::kStorageTypeTemporary,
+    manager->AddOrigin(kOrigin1, kTemporary, kClientFile, base::Time::Now());
+    manager->AddOrigin(kOrigin3, kTemporary, kClientFile,
         base::Time::Now() - base::TimeDelta::FromDays(1));
 
-    EXPECT_TRUE(manager->OriginHasData(kOrigin1,
-        quota::kStorageTypeTemporary));
-    EXPECT_FALSE(manager->OriginHasData(kOrigin2,
-        quota::kStorageTypeTemporary));
-    EXPECT_TRUE(manager->OriginHasData(kOrigin3,
-        quota::kStorageTypeTemporary));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin1, kTemporary, kClientFile));
+    EXPECT_FALSE(manager->OriginHasData(kOrigin2, kTemporary, kClientFile));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin3, kTemporary, kClientFile));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RemoveQuotaManagedDataTester);
 };
 
 // Test Class ----------------------------------------------------------------
 
 class BrowsingDataRemoverTest : public testing::Test,
                                 public content::NotificationObserver {
@@ skipping 135 matching lines @@
   ASSERT_TRUE(tester->HistoryContainsURL(kOrigin2));
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
       BrowsingDataRemover::REMOVE_HISTORY, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
   EXPECT_FALSE(tester->HistoryContainsURL(kOrigin1));
   EXPECT_TRUE(tester->HistoryContainsURL(kOrigin2));
 }
 
+TEST_F(BrowsingDataRemoverTest, QuotaClientMaskGeneration) {
+  EXPECT_EQ(quota::QuotaClient::kFileSystem,
+            BrowsingDataRemover::GenerateQuotaClientMask(
+                BrowsingDataRemover::REMOVE_FILE_SYSTEMS));
+  EXPECT_EQ(quota::QuotaClient::kDatabase,
+            BrowsingDataRemover::GenerateQuotaClientMask(
+                BrowsingDataRemover::REMOVE_WEBSQL));
+  EXPECT_EQ(quota::QuotaClient::kAppcache,
+            BrowsingDataRemover::GenerateQuotaClientMask(
+                BrowsingDataRemover::REMOVE_APPCACHE));
+  EXPECT_EQ(quota::QuotaClient::kIndexedDatabase,
+            BrowsingDataRemover::GenerateQuotaClientMask(
+                BrowsingDataRemover::REMOVE_INDEXEDDB));
+  EXPECT_EQ(quota::QuotaClient::kFileSystem |
+            quota::QuotaClient::kDatabase |
+            quota::QuotaClient::kAppcache |
+            quota::QuotaClient::kIndexedDatabase,
+            BrowsingDataRemover::GenerateQuotaClientMask(
+                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB));
+}
+
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   tester->PopulateTestQuotaManagedData(GetMockManager());
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   tester->PopulateTestQuotaManagedTemporaryData(GetMockManager());
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   tester->PopulateTestQuotaManagedPersistentData(GetMockManager());
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   GetMockManager();  // Creates the QuotaManager instance.
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
   tester->PopulateTestQuotaManagedData(GetMockManager());
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
   tester->PopulateTestQuotaManagedData(GetMockManager());
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_WEEK,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
   // Protect kOrigin1.
   scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
           new MockExtensionSpecialStoragePolicy;
   mock_policy->AddProtected(kOrigin1.GetOrigin());
   GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
 
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
   tester->PopulateTestQuotaManagedData(GetMockManager());
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, tester.get());
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypeTemporary));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2,
-      quota::kStorageTypePersistent));
-  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3,
-      quota::kStorageTypePersistent));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin1, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
+      kClientFile));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
+      kClientFile));
 }
 
 }  // namespace