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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/quota/mock_quota_manager_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
« webkit/quota/mock_quota_manager.cc ('K') | « webkit/quota/mock_quota_manager.cc ('k') | webkit/quota/quota_client.h » ('j') | webkit/quota/quota_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 503f8aa3a20b673260fea28bb6d011ab133d9356..8d7b7aa0a81e8c8e05b01b69807deac7534a4417 100644
--- a/webkit/quota/mock_quota_manager_unittest.cc
+++ b/webkit/quota/mock_quota_manager_unittest.cc
@@ -26,6 +26,12 @@ 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()
@@ -61,8 +67,8 @@ class MockQuotaManagerTest : public testing::Test {
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));
}
@@ -103,40 +109,57 @@ class MockQuotaManagerTest : public testing::Test {
};
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));
-
- 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, 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(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));
+ 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, 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, 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, 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) {
@@ -145,34 +168,34 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) {
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));
« webkit/quota/mock_quota_manager.cc ('K') | « webkit/quota/mock_quota_manager.cc ('k') | webkit/quota/quota_client.h » ('j') | webkit/quota/quota_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698