QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

chrome/browser/browsing_data_remover_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 "chrome/browser/browsing_data_remover.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 19 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 kTemp = quota::kStorageTypeTemporary;

[jochen (gone - plz use gerrit), 2011/09/12 11:23:00]

these abbreviations make it kinda hard to read the tests IMO :/

[kinuko, 2011/09/26 09:43:48]

We use such abbrevs in other tests as well (since kStorageTypeWhatever is kinda
long) so I think it'd be ok (IMHO) :)

+const quota::StorageType kPers = quota::kStorageTypePersistent;
+
+const quota::QuotaClient::ID kClientID1 = quota::QuotaClient::kFileSystem;
+const quota::QuotaClient::ID kClientID2 = 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 138 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, kPers, kClientID1, base::Time());
+    manager->AddOrigin(kOrigin3, kPers, kClientID1,
         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, kPers, kClientID1));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin2, kPers, kClientID1));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin3, kPers, kClientID1));
   }
 
   void PopulateTestQuotaManagedTemporaryData(quota::MockQuotaManager* manager) {
-    manager->AddOrigin(kOrigin1, quota::kStorageTypeTemporary,
-        base::Time::Now());
-    manager->AddOrigin(kOrigin3, quota::kStorageTypeTemporary,
+    manager->AddOrigin(kOrigin1, kTemp, kClientID1, base::Time::Now());
+    manager->AddOrigin(kOrigin3, kTemp, kClientID1,
         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, kTemp, kClientID1));
+    EXPECT_FALSE(manager->OriginHasData(kOrigin2, kTemp, kClientID1));
+    EXPECT_TRUE(manager->OriginHasData(kOrigin3, kTemp, kClientID1));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RemoveQuotaManagedDataTester);
 };
 
 // Test Class ----------------------------------------------------------------
 
 class BrowsingDataRemoverTest : public testing::Test {
  public:
@@ skipping 110 matching lines @@
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   tester->PopulateTestQuotaManagedData(GetMockManager());
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   tester->PopulateTestQuotaManagedTemporaryData(GetMockManager());
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   tester->PopulateTestQuotaManagedPersistentData(GetMockManager());
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
 
   GetMockManager();  // Creates the QuotaManager instance.
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_SITE_DATA, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
   tester->PopulateTestQuotaManagedData(GetMockManager());
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
       BrowsingDataRemover::REMOVE_SITE_DATA, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
   scoped_ptr<RemoveQuotaManagedDataTester> tester(
       new RemoveQuotaManagedDataTester());
   tester->PopulateTestQuotaManagedData(GetMockManager());
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_WEEK,
       BrowsingDataRemover::REMOVE_SITE_DATA, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_TRUE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 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, tester.get());
 
-  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, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemp, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPers, kClientID1));
+  EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPers, kClientID1));
 }
 
 }  // namespace