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

Unified Diff: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

Issue 2697123004: Convert RemoveDataMask from enum to pointers and split it between content and embedder (Closed)
Patch Set: Android compilation Created 3 years, 10 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
Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
index 64a954affe8c56129de076da59fe31e0228b266f..93b5d23b6be8e6e9b2c0c35254762798b1571da2 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
#include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
+#include "chrome/browser/browsing_data/chrome_browsing_data_types.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/domain_reliability/service_factory.h"
#include "chrome/browser/download/chrome_download_manager_delegate.h"
@@ -85,6 +86,7 @@
#endif
using content::BrowsingDataFilterBuilder;
+using content::BrowsingDataType;
using domain_reliability::CLEAR_BEACONS;
using domain_reliability::CLEAR_CONTEXTS;
using domain_reliability::DomainReliabilityClearMode;
@@ -726,6 +728,13 @@ class RemoveDownloadsTester {
DISALLOW_COPY_AND_ASSIGN(RemoveDownloadsTester);
};
+// 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
// RemoveAutofillTester is not a part of the anonymous namespace above, as
@@ -845,10 +854,11 @@ class ChromeBrowsingDataRemoverDelegateTest : public testing::Test {
~ChromeBrowsingDataRemoverDelegateTest() override {}
- 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 content::BrowsingDataType*>& remove_mask,
+ bool include_protected_origins) {
int origin_type_mask = BrowsingDataHelper::UNPROTECTED_WEB;
if (include_protected_origins)
origin_type_mask |= BrowsingDataHelper::PROTECTED_WEB;
@@ -863,7 +873,7 @@ class ChromeBrowsingDataRemoverDelegateTest : public testing::Test {
void BlockUntilOriginDataRemoved(
const base::Time& delete_begin,
const base::Time& delete_end,
- int remove_mask,
+ const std::set<const content::BrowsingDataType*>& remove_mask,
std::unique_ptr<BrowsingDataFilterBuilder> filter_builder) {
BrowsingDataRemoverCompletionObserver completion_observer(remover_);
static_cast<BrowsingDataRemoverImpl*>(remover_)
@@ -878,7 +888,7 @@ class ChromeBrowsingDataRemoverDelegateTest : public testing::Test {
return remover_->GetLastUsedBeginTime();
}
- int GetRemovalMask() {
+ const std::set<const content::BrowsingDataType*>& GetRemovalMask() {
return remover_->GetLastUsedRemovalMask();
}
@@ -914,9 +924,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveSafeBrowsingCookieForever) {
ASSERT_TRUE(tester.ContainsCookie());
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ {&kBrowsingDataTypeCookies}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeCookies}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
EXPECT_FALSE(tester.ContainsCookie());
}
@@ -929,9 +939,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
ASSERT_TRUE(tester.ContainsCookie());
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ {&kBrowsingDataTypeCookies}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeCookies}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
// Removing with time period other than all time should not clear safe
// browsing cookies.
@@ -948,10 +958,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST));
filter->AddRegisterableDomain(kTestRegisterableDomain1);
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES,
- std::move(filter));
+ {&kBrowsingDataTypeCookies}, std::move(filter));
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeCookies}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
EXPECT_TRUE(tester.ContainsCookie());
@@ -959,8 +968,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST));
filter2->AddRegisterableDomain(kTestRegisterableDomain1);
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES,
- std::move(filter2));
+ {&kBrowsingDataTypeCookies}, std::move(filter2));
EXPECT_FALSE(tester.ContainsCookie());
}
@@ -972,9 +980,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveHistoryForever) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
EXPECT_FALSE(tester.HistoryContainsURL(kOrigin1));
}
@@ -991,9 +999,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveHistoryForLastHour) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin2));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
EXPECT_FALSE(tester.HistoryContainsURL(kOrigin1));
EXPECT_TRUE(tester.HistoryContainsURL(kOrigin2));
@@ -1018,8 +1026,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveHistoryProhibited) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin2));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ {&kBrowsingDataTypeHistory}, false);
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
// Nothing should have been deleted.
@@ -1043,9 +1051,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
RemovePasswordsTester tester(GetProfile());
EXPECT_CALL(*tester.store(), RemoveLoginsByURLAndTimeImpl(_, _, _));
- int removal_mask = BrowsingDataRemover::REMOVE_HISTORY |
- BrowsingDataRemover::REMOVE_PASSWORDS;
-
+ std::set<const BrowsingDataType*> removal_mask = {
+ &kBrowsingDataTypeHistory, &kBrowsingDataTypePasswords};
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
removal_mask, false);
EXPECT_EQ(removal_mask, GetRemovalMask());
@@ -1066,9 +1073,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveExternalProtocolData) {
EXPECT_FALSE(
profile->GetPrefs()->GetDictionary(prefs::kExcludedSchemes)->empty());
- BlockUntilBrowsingDataRemoved(
- AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA, false);
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
+ {&kBrowsingDataTypeExternalProtocolData},
+ false);
EXPECT_TRUE(
profile->GetPrefs()->GetDictionary(prefs::kExcludedSchemes)->empty());
}
@@ -1083,8 +1090,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveFaviconsForever) {
ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(page_url));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ {&kBrowsingDataTypeHistory}, false);
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_FALSE(favicon_tester.HasFaviconForPageURL(page_url));
}
@@ -1110,8 +1117,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ExpireBookmarkFavicons) {
ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(bookmarked_page));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ {&kBrowsingDataTypeHistory}, false);
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_TRUE(favicon_tester.HasExpiredFaviconForPageURL(bookmarked_page));
}
@@ -1132,10 +1139,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
std::unique_ptr<BrowsingDataFilterBuilder> builder(
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST));
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY,
- std::move(builder));
+ {&kBrowsingDataTypeHistory}, std::move(builder));
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
EXPECT_FALSE(tester.HistoryContainsURL(kOrigin1));
EXPECT_TRUE(tester.HistoryContainsURL(kOrigin2));
@@ -1151,9 +1157,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, AutofillRemovalLastHour) {
ASSERT_TRUE(tester.HasProfile());
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_FORM_DATA, false);
+ {&kBrowsingDataTypeFormData}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FORM_DATA, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeFormData}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
ASSERT_FALSE(tester.HasProfile());
}
@@ -1167,9 +1173,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, AutofillRemovalEverything) {
ASSERT_TRUE(tester.HasProfile());
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_FORM_DATA, false);
+ {&kBrowsingDataTypeFormData}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_FORM_DATA, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeFormData}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
ASSERT_FALSE(tester.HasProfile());
}
@@ -1186,9 +1192,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
EXPECT_TRUE(tester.HasOrigin(autofill::kSettingsOrigin));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
- EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeHistory}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
EXPECT_TRUE(tester.HasOrigin(std::string()));
EXPECT_FALSE(tester.HasOrigin(kWebOrigin));
@@ -1200,11 +1206,11 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ZeroSuggestCacheClear) {
prefs->SetString(omnibox::kZeroSuggestCachedResults,
"[\"\", [\"foo\", \"bar\"]]");
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ {&kBrowsingDataTypeCookies}, false);
// Expect the prefs to be cleared when cookies are removed.
EXPECT_TRUE(prefs->GetString(omnibox::kZeroSuggestCachedResults).empty());
- EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeCookies}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
}
@@ -1232,8 +1238,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
.WillOnce(WithArgs<3>(Invoke(FakeDBusCall)));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_MEDIA_LICENSES,
- false);
+ {&kBrowsingDataTypeMediaLicenses}, false);
chromeos::DBusThreadManager::Shutdown();
}
@@ -1251,7 +1256,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, DomainReliability_Beacons) {
clear_domain_reliability_tester();
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_BEACONS, tester.last_clear_mode());
EXPECT_TRUE(ProbablySameFilters(
@@ -1270,8 +1275,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
builder->AddRegisterableDomain(kTestRegisterableDomain1);
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY,
- builder->Copy());
+ {&kBrowsingDataTypeHistory}, builder->Copy());
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_BEACONS, tester.last_clear_mode());
EXPECT_TRUE(ProbablySameFilters(
@@ -1283,7 +1287,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, DomainReliability_Contexts) {
clear_domain_reliability_tester();
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ {&kBrowsingDataTypeCookies}, false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
EXPECT_TRUE(ProbablySameFilters(
@@ -1300,8 +1304,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
builder->AddRegisterableDomain(kTestRegisterableDomain1);
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES,
- builder->Copy());
+ {&kBrowsingDataTypeCookies}, builder->Copy());
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
EXPECT_TRUE(ProbablySameFilters(
@@ -1314,8 +1317,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, DomainReliability_ContextsWin) {
BlockUntilBrowsingDataRemoved(
base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY | BrowsingDataRemover::REMOVE_COOKIES,
- false);
+ {&kBrowsingDataTypeHistory, &kBrowsingDataTypeCookies}, false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
}
@@ -1326,7 +1328,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
clear_domain_reliability_tester();
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES, true);
+ {&kBrowsingDataTypeCookies}, true);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
}
@@ -1339,8 +1341,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
DISABLED_DomainReliability_NoMonitor) {
BlockUntilBrowsingDataRemoved(
base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY | BrowsingDataRemover::REMOVE_COOKIES,
- false);
+ {&kBrowsingDataTypeHistory, &kBrowsingDataTypeCookies}, false);
}
// Tests that the deletion of downloads completes successfully and that
@@ -1352,7 +1353,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDownloads) {
*tester.download_manager(), RemoveDownloadsByURLAndTime(_, _, _));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_DOWNLOADS, false);
+ {&kBrowsingDataTypeDownloads}, false);
}
TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordStatistics) {
@@ -1363,7 +1364,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordStatistics) {
ProbablySameFilter(empty_filter),
base::Time(), base::Time::Max()));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
}
// TODO(crbug.com/589586): Disabled, since history is not yet marked as
@@ -1381,8 +1382,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
RemoveStatisticsByOriginAndTimeImpl(
ProbablySameFilter(filter), base::Time(), base::Time::Max()));
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY,
- std::move(builder));
+ {&kBrowsingDataTypeHistory}, std::move(builder));
}
TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordsByTimeOnly) {
@@ -1394,7 +1394,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordsByTimeOnly) {
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_PASSWORDS, false);
+ {&kBrowsingDataTypePasswords}, false);
}
// Disabled, since passwords are not yet marked as a filterable datatype.
@@ -1410,7 +1410,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_PASSWORDS,
+ {&kBrowsingDataTypePasswords},
std::move(builder));
}
@@ -1425,7 +1425,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, DisableAutoSignIn) {
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ {&kBrowsingDataTypeCookies}, false);
}
TEST_F(ChromeBrowsingDataRemoverDelegateTest,
@@ -1441,10 +1441,9 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
DisableAutoSignInForOriginsImpl(ProbablySameFilter(empty_filter)))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_COOKIES |
- BrowsingDataRemover::REMOVE_PASSWORDS,
- false);
+ BlockUntilBrowsingDataRemoved(
+ base::Time(), base::Time::Max(),
+ {&kBrowsingDataTypeCookies, &kBrowsingDataTypePasswords}, false);
}
TEST_F(ChromeBrowsingDataRemoverDelegateTest,
@@ -1471,10 +1470,10 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
filter->AddRegisterableDomain(kTestRegisterableDomain1);
filter->AddRegisterableDomain(kTestRegisterableDomain3);
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
+ {&kBrowsingDataTypeSiteUsageData},
std::move(filter));
- EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeSiteUsageData}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
// Verify we only have true, and they're origin1, origin3, and origin4.
@@ -1510,10 +1509,10 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDurablePermission) {
filter->AddRegisterableDomain(kTestRegisterableDomain1);
filter->AddRegisterableDomain(kTestRegisterableDomain3);
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_DURABLE_PERMISSION,
+ {&kBrowsingDataTypeDurablePermission},
std::move(filter));
- EXPECT_EQ(BrowsingDataRemover::REMOVE_DURABLE_PERMISSION, GetRemovalMask());
+ EXPECT_EQ(Mask({&kBrowsingDataTypeDurablePermission}), GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
// Verify we only have allow for the first origin.
@@ -1555,7 +1554,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
net::HttpAuth::AUTH_SCHEME_BASIC));
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_PASSWORDS, false);
+ {&kBrowsingDataTypePasswords}, false);
EXPECT_EQ(nullptr, http_auth_cache->Lookup(kOrigin1, kTestRealm,
net::HttpAuth::AUTH_SCHEME_BASIC));
@@ -1573,7 +1572,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1);
{
- // Test REMOVE_HISTORY.
+ // Test kBrowsingDataTypeHistory.
EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
@@ -1588,7 +1587,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
+ {&kBrowsingDataTypeSiteUsageData},
std::move(filter_builder_1));
// kOrigin1 should be gone, but kOrigin2 remains.
@@ -1604,7 +1603,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
// Everything should be gone.
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
@@ -1619,7 +1618,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
}
{
- // Test REMOVE_SITE_DATA.
+ // Test kBrowsingDataTypeSiteUsageData.
EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
@@ -1634,7 +1633,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
+ {&kBrowsingDataTypeSiteUsageData},
std::move(filter_builder_2));
// kOrigin2 should be gone, but kOrigin1 remains.
@@ -1650,8 +1649,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
- false);
+ {&kBrowsingDataTypeSiteUsageData}, false);
// Everything should be gone.
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
@@ -1684,7 +1682,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) {
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST));
filter_builder->AddRegisterableDomain(kTestRegisterableDomain3);
BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_PLUGIN_DATA,
+ {&kBrowsingDataTypePluginData},
std::move(filter_builder));
// Plugin data for |kOrigin3.host()| should have been removed.
@@ -1748,8 +1746,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
BrowsingDataRemoverCompletionObserver completion_observer(remover);
remover->RemoveAndReply(delete_begin, base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY,
- BrowsingDataHelper::ALL, &completion_observer);
+ {&kBrowsingDataTypeHistory}, BrowsingDataHelper::ALL,
+ &completion_observer);
completion_observer.BlockUntilCompletion();
// There should be only 1 recently visited bookmarks.
@@ -1778,7 +1776,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
// Clearing a part of the history has no effect.
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(2));
EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.75));
@@ -1786,7 +1784,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
// Clearing the full history does the trick.
BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ {&kBrowsingDataTypeHistory}, false);
EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0));
EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0));

Powered by Google App Engine
This is Rietveld 408576698