Index: chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc |
index 75acf791a7ceeea8ac5725abcc17bd3bf7826a15..8b9ef5f7466387899671c1bd5c6c86b856fd9d96 100644 |
--- a/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc |
+++ b/chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc |
@@ -68,6 +68,7 @@ class MockExtensionSpecialStoragePolicy; |
using content::BrowserThread; |
using content::BrowserContext; |
using content::BrowsingDataFilterBuilder; |
+using content::BrowsingDataType; |
using content::StoragePartition; |
using testing::_; |
using testing::ByRef; |
@@ -307,6 +308,22 @@ base::Time AnHourAgo() { |
return base::Time::Now() - base::TimeDelta::FromHours(1); |
} |
+const std::set<const BrowsingDataType*> kQuotaMask = { |
+ &content::kBrowsingDataTypeFileSystems, |
+ &content::kBrowsingDataTypeWebSQL, |
+ &content::kBrowsingDataTypeAppCache, |
+ &content::kBrowsingDataTypeServiceWorkers, |
+ &content::kBrowsingDataTypeCacheStorage, |
+ &content::kBrowsingDataTypeIndexedDB |
+}; |
+ |
+// A wrapper to typecast a const initializer to std::set in ambiguous |
+// situations, such as the EXPECT macros. |
+inline const std::set<const BrowsingDataType*> Mask( |
+ const std::set<const BrowsingDataType*> mask) { |
+ return mask; |
+} |
+ |
} // namespace |
// Testers ------------------------------------------------------------------- |
@@ -562,10 +579,11 @@ class BrowsingDataRemoverImplTest : public testing::Test { |
base::RunLoop().RunUntilIdle(); |
} |
- void BlockUntilBrowsingDataRemoved(const base::Time& delete_begin, |
- const base::Time& delete_end, |
- int remove_mask, |
- bool include_protected_origins) { |
+ void BlockUntilBrowsingDataRemoved( |
+ const base::Time& delete_begin, |
+ const base::Time& delete_end, |
+ const std::set<const BrowsingDataType*> remove_mask, |
+ bool include_protected_origins) { |
TestStoragePartition storage_partition; |
remover_->OverrideStoragePartitionForTesting(&storage_partition); |
@@ -587,7 +605,7 @@ class BrowsingDataRemoverImplTest : public testing::Test { |
void BlockUntilOriginDataRemoved( |
const base::Time& delete_begin, |
const base::Time& delete_end, |
- int remove_mask, |
+ const std::set<const BrowsingDataType*> remove_mask, |
std::unique_ptr<BrowsingDataFilterBuilder> filter_builder) { |
TestStoragePartition storage_partition; |
remover_->OverrideStoragePartitionForTesting(&storage_partition); |
@@ -614,7 +632,7 @@ class BrowsingDataRemoverImplTest : public testing::Test { |
return remover_->GetLastUsedBeginTime(); |
} |
- int GetRemovalMask() { |
+ const std::set<const content::BrowsingDataType*>& GetRemovalMask() { |
return remover_->GetLastUsedRemovalMask(); |
} |
@@ -673,10 +691,11 @@ class BrowsingDataRemoverImplTest : public testing::Test { |
// Tests --------------------------------------------------------------------- |
TEST_F(BrowsingDataRemoverImplTest, RemoveCookieForever) { |
- BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_COOKIES, false); |
+ BlockUntilBrowsingDataRemoved( |
+ base::Time(), base::Time::Max(), |
+ Mask({ &content::kBrowsingDataTypeCookies }), false); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeCookies }), GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify that storage partition was instructed to remove the cookies. |
@@ -689,10 +708,11 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveCookieForever) { |
} |
TEST_F(BrowsingDataRemoverImplTest, RemoveCookieLastHour) { |
- BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_COOKIES, false); |
+ BlockUntilBrowsingDataRemoved( |
+ AnHourAgo(), base::Time::Max(), |
+ Mask({ &content::kBrowsingDataTypeCookies }), false); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeCookies }), GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify that storage partition was instructed to remove the cookies. |
@@ -712,10 +732,10 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveCookiesDomainBlacklist) { |
filter->AddRegisterableDomain(kTestRegisterableDomain1); |
filter->AddRegisterableDomain(kTestRegisterableDomain3); |
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_COOKIES, |
+ { &content::kBrowsingDataTypeCookies }, |
std::move(filter)); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeCookies }), GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify that storage partition was instructed to remove the cookies. |
@@ -761,7 +781,7 @@ TEST_F(BrowsingDataRemoverImplTest, ClearHttpAuthCache_RemoveCookies) { |
net::HttpAuth::AUTH_SCHEME_BASIC)); |
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_COOKIES, false); |
+ { &content::kBrowsingDataTypeCookies }, false); |
EXPECT_EQ(nullptr, http_auth_cache->Lookup(kOrigin1, kTestRealm, |
net::HttpAuth::AUTH_SCHEME_BASIC)); |
@@ -775,9 +795,10 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveChannelIDForever) { |
EXPECT_EQ(1, tester.ChannelIDCount()); |
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, false); |
+ { &content::kBrowsingDataTypeChannelIDs }, |
+ false); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_CHANNEL_IDS, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeChannelIDs }), GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
EXPECT_EQ(1, tester.ssl_config_changed_count()); |
EXPECT_EQ(0, tester.ChannelIDCount()); |
@@ -794,9 +815,10 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveChannelIDLastHour) { |
EXPECT_EQ(2, tester.ChannelIDCount()); |
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, false); |
+ { &content::kBrowsingDataTypeChannelIDs }, |
+ false); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_CHANNEL_IDS, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeChannelIDs }), GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
EXPECT_EQ(1, tester.ssl_config_changed_count()); |
ASSERT_EQ(1, tester.ChannelIDCount()); |
@@ -818,7 +840,7 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveChannelIDsForServerIdentifiers) { |
filter_builder->AddRegisterableDomain(kTestRegisterableDomain1); |
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, |
+ { &content::kBrowsingDataTypeChannelIDs }, |
std::move(filter_builder)); |
EXPECT_EQ(1, tester.ChannelIDCount()); |
@@ -835,10 +857,11 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveUnprotectedLocalStorageForever) { |
#endif |
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE, |
+ { &content::kBrowsingDataTypeLocalStorage }, |
false); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeLocalStorage }), |
+ GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify that storage partition was instructed to remove the data correctly. |
@@ -865,10 +888,11 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveProtectedLocalStorageForever) { |
#endif |
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE, |
+ { &content::kBrowsingDataTypeLocalStorage }, |
true); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeLocalStorage }), |
+ GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB | |
BrowsingDataHelper::PROTECTED_WEB, GetOriginTypeMask()); |
@@ -895,9 +919,10 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveLocalStorageForLastWeek) { |
BlockUntilBrowsingDataRemoved( |
base::Time::Now() - base::TimeDelta::FromDays(7), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE, false); |
+ { &content::kBrowsingDataTypeLocalStorage }, false); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask()); |
+ EXPECT_EQ(Mask({ &content::kBrowsingDataTypeLocalStorage }), |
+ GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify that storage partition was instructed to remove the data correctly. |
@@ -923,8 +948,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveMultipleTypes) { |
EXPECT_CALL(*downloads_tester.download_manager(), |
RemoveDownloadsByURLAndTime(_, _, _)); |
- int removal_mask = BrowsingDataRemover::REMOVE_DOWNLOADS | |
- BrowsingDataRemover::REMOVE_COOKIES; |
+ std::set<const BrowsingDataType*> removal_mask = |
+ { &content::kBrowsingDataTypeDownloads, |
Bernhard Bauer
2017/02/17 11:10:43
Is this what clang-format produces? Sigh...
msramek
2017/02/17 18:00:20
*cough* that might have been me *cough*
Sorry for
|
+ &content::kBrowsingDataTypeCookies }; |
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
removal_mask, false); |
@@ -943,22 +969,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveMultipleTypes) { |
TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedDataForeverBoth) { |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -981,22 +994,9 @@ TEST_F(BrowsingDataRemoverImplTest, |
#endif |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1026,22 +1026,9 @@ TEST_F(BrowsingDataRemoverImplTest, |
#endif |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1070,22 +1057,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedDataForeverNeither) { |
#endif |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1115,21 +1089,9 @@ TEST_F(BrowsingDataRemoverImplTest, |
builder->AddRegisterableDomain(kTestRegisterableDomain1); |
// Remove Origin 1. |
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- std::move(builder)); |
+ kQuotaMask, std::move(builder)); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- GetRemovalMask()); |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1152,22 +1114,9 @@ TEST_F(BrowsingDataRemoverImplTest, |
TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedDataForLastHour) { |
BlockUntilBrowsingDataRemoved( |
- AnHourAgo(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ AnHourAgo(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1193,21 +1142,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedDataForLastHour) { |
TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedDataForLastWeek) { |
BlockUntilBrowsingDataRemoved( |
base::Time::Now() - base::TimeDelta::FromDays(7), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1238,22 +1175,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedUnprotectedOrigins) { |
#endif |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_WEBSQL | |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_INDEXEDDB, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1289,21 +1213,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedProtectedSpecificOrigin) { |
// Try to remove kOrigin1. Expect failure. |
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- std::move(builder)); |
+ kQuotaMask, std::move(builder)); |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- GetRemovalMask()); |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1337,22 +1249,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveQuotaManagedProtectedOrigins) { |
// Try to remove kOrigin1. Expect success. |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- true); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, true); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::PROTECTED_WEB | |
BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
@@ -1383,22 +1282,9 @@ TEST_F(BrowsingDataRemoverImplTest, |
#endif |
BlockUntilBrowsingDataRemoved( |
- base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- false); |
- |
- EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE | |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS | |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE | |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS | |
- BrowsingDataRemover::REMOVE_INDEXEDDB | |
- BrowsingDataRemover::REMOVE_WEBSQL, |
- GetRemovalMask()); |
+ base::Time(), base::Time::Max(), kQuotaMask, false); |
+ |
+ EXPECT_EQ(kQuotaMask, GetRemovalMask()); |
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask()); |
// Verify storage partition related stuffs. |
@@ -1448,7 +1334,7 @@ TEST_F(BrowsingDataRemoverImplTest, CompletionInhibition) { |
BrowsingDataRemoverFactory::GetForBrowserContext(GetBrowserContext())); |
InspectableCompletionObserver completion_observer(remover); |
remover->RemoveAndReply(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_HISTORY, |
+ { &content::kBrowsingDataTypeCookies }, |
BrowsingDataHelper::UNPROTECTED_WEB, |
&completion_observer); |
@@ -1478,7 +1364,7 @@ TEST_F(BrowsingDataRemoverImplTest, EarlyShutdown) { |
InspectableCompletionObserver completion_observer(remover); |
BrowsingDataRemoverCompletionInhibitor completion_inhibitor; |
remover->RemoveAndReply(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_HISTORY, |
+ { &content::kBrowsingDataTypeCookies }, |
BrowsingDataHelper::UNPROTECTED_WEB, |
&completion_observer); |
@@ -1508,8 +1394,9 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveDownloadsByTimeOnly) { |
*tester.download_manager(), |
RemoveDownloadsByURLAndTime(ProbablySameFilter(filter), _, _)); |
- BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_DOWNLOADS, false); |
+ BlockUntilBrowsingDataRemoved( |
+ base::Time(), base::Time::Max(), |
+ { &content::kBrowsingDataTypeDownloads }, false); |
} |
TEST_F(BrowsingDataRemoverImplTest, RemoveDownloadsByOrigin) { |
@@ -1524,7 +1411,7 @@ TEST_F(BrowsingDataRemoverImplTest, RemoveDownloadsByOrigin) { |
RemoveDownloadsByURLAndTime(ProbablySameFilter(filter), _, _)); |
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_DOWNLOADS, |
+ { &content::kBrowsingDataTypeDownloads }, |
std::move(builder)); |
} |
@@ -1599,32 +1486,32 @@ TEST_F(BrowsingDataRemoverImplTest, MultipleTasks) { |
// observers. |
std::list<BrowsingDataRemoverImpl::RemovalTask> tasks; |
tasks.emplace_back(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_HISTORY, |
+ Mask({ &content::kBrowsingDataTypeCookies }), |
BrowsingDataHelper::UNPROTECTED_WEB, |
BrowsingDataFilterBuilder::Create( |
BrowsingDataFilterBuilder::BLACKLIST), |
observer.target_a()); |
tasks.emplace_back(base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_COOKIES, |
+ Mask({ &content::kBrowsingDataTypeCookies }), |
BrowsingDataHelper::PROTECTED_WEB, |
BrowsingDataFilterBuilder::Create( |
BrowsingDataFilterBuilder::BLACKLIST), |
nullptr); |
tasks.emplace_back( |
base::Time::Now(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_PASSWORDS, BrowsingDataHelper::ALL, |
+ Mask({ &content::kBrowsingDataTypeDownloads }), BrowsingDataHelper::ALL, |
BrowsingDataFilterBuilder::Create( |
BrowsingDataFilterBuilder::BLACKLIST), |
observer.target_b()); |
tasks.emplace_back( |
base::Time(), base::Time::UnixEpoch(), |
- BrowsingDataRemover::REMOVE_WEBSQL, |
+ Mask({ &content::kBrowsingDataTypeWebSQL }), |
BrowsingDataHelper::UNPROTECTED_WEB, |
std::move(filter_builder_1), |
observer.target_b()); |
tasks.emplace_back( |
base::Time::UnixEpoch(), base::Time::Now(), |
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, |
+ Mask({ &content::kBrowsingDataTypeChannelIDs }), |
BrowsingDataHelper::ALL, |
std::move(filter_builder_2), |
nullptr); |
@@ -1686,25 +1573,28 @@ TEST_F(BrowsingDataRemoverImplTest, MultipleTasksInQuickSuccession) { |
BrowsingDataRemoverFactory::GetForBrowserContext(GetBrowserContext())); |
EXPECT_FALSE(remover->is_removing()); |
- int test_removal_masks[] = { |
- BrowsingDataRemover::REMOVE_COOKIES, |
- BrowsingDataRemover::REMOVE_PASSWORDS, |
- BrowsingDataRemover::REMOVE_COOKIES, |
- BrowsingDataRemover::REMOVE_COOKIES, |
- BrowsingDataRemover::REMOVE_COOKIES, |
- BrowsingDataRemover::REMOVE_HISTORY, |
- BrowsingDataRemover::REMOVE_HISTORY, |
- BrowsingDataRemover::REMOVE_HISTORY, |
- BrowsingDataRemover::REMOVE_COOKIES | BrowsingDataRemover::REMOVE_HISTORY, |
- BrowsingDataRemover::REMOVE_COOKIES | BrowsingDataRemover::REMOVE_HISTORY, |
- BrowsingDataRemover::REMOVE_COOKIES | |
- BrowsingDataRemover::REMOVE_HISTORY | |
- BrowsingDataRemover::REMOVE_PASSWORDS, |
- BrowsingDataRemover::REMOVE_PASSWORDS, |
- BrowsingDataRemover::REMOVE_PASSWORDS, |
+ std::set<const BrowsingDataType*> test_removal_masks[] = { |
+ { &content::kBrowsingDataTypeCookies }, |
+ { &content::kBrowsingDataTypeChannelIDs }, |
+ { &content::kBrowsingDataTypeCookies }, |
+ { &content::kBrowsingDataTypeCookies }, |
+ { &content::kBrowsingDataTypeCookies }, |
+ { &content::kBrowsingDataTypeDownloads }, |
+ { &content::kBrowsingDataTypeDownloads }, |
+ { &content::kBrowsingDataTypeDownloads }, |
+ { &content::kBrowsingDataTypeCookies, |
+ &content::kBrowsingDataTypeDownloads }, |
+ { &content::kBrowsingDataTypeCookies, |
+ &content::kBrowsingDataTypeDownloads }, |
+ { &content::kBrowsingDataTypeCookies, |
+ &content::kBrowsingDataTypeDownloads, |
+ &content::kBrowsingDataTypeChannelIDs }, |
+ { &content::kBrowsingDataTypeChannelIDs }, |
+ { &content::kBrowsingDataTypeChannelIDs }, |
}; |
- for (int removal_mask : test_removal_masks) { |
+ for (const std::set<const BrowsingDataType*>& removal_mask |
+ : test_removal_masks) { |
remover->Remove(base::Time(), base::Time::Max(), removal_mask, |
BrowsingDataHelper::UNPROTECTED_WEB); |
} |
@@ -1714,7 +1604,7 @@ TEST_F(BrowsingDataRemoverImplTest, MultipleTasksInQuickSuccession) { |
// Add one more deletion and wait for it. |
BlockUntilBrowsingDataRemoved( |
base::Time(), base::Time::Max(), |
- BrowsingDataRemover::REMOVE_COOKIES, |
+ { &content::kBrowsingDataTypeCookies }, |
BrowsingDataHelper::UNPROTECTED_WEB); |
EXPECT_FALSE(remover->is_removing()); |