Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5220)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browsing_data_remover_unittest.cc

Issue 7839029: QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/browsing_data_remover.cc ('K') | « chrome/browser/browsing_data_remover.cc ('k') | webkit/quota/mock_quota_manager.h » ('j') | webkit/quota/mock_quota_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data_remover_unittest.cc
index ad501dce1aa0bb17ce0b7cb7cef7d8db2ea1b094..583613a6bde4375442d8041d20c6282b2ce89d01 100644
--- a/chrome/browser/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data_remover_unittest.cc
@@ -37,6 +37,12 @@ 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
kinuko 2011/09/26 09:43:48 We use such abbrevs in other tests as well (since
+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()
@@ -195,31 +201,23 @@ class RemoveQuotaManagedDataTester : public BrowsingDataRemoverTester {
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:
@@ -350,18 +348,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
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) {
@@ -372,18 +364,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
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) {
@@ -394,18 +380,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
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) {
@@ -416,18 +396,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
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) {
@@ -438,18 +412,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
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) {
@@ -460,18 +428,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
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) {
@@ -488,18 +450,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
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
« chrome/browser/browsing_data_remover.cc ('K') | « chrome/browser/browsing_data_remover.cc ('k') | webkit/quota/mock_quota_manager.h » ('j') | webkit/quota/mock_quota_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698