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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2578723002: Reduce BrowsingDataRemover's dependencies on Chrome (Closed)
Patch Set: A new callsite appeared through rebase - fixed the compilation error. Created 3 years, 12 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
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_browsertest.cc ('k') | chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index b2820437ab86d24d6983b688c765a0558926aa1d..03d3f3b9444fccde00999067cc854bef2eb34e74 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -400,6 +400,10 @@ bool ProbablySameFilters(
return ProbablySameFilter(filter1).MatchAndExplain(filter2, nullptr);
}
+base::Time AnHourAgo() {
+ return base::Time::Now() - base::TimeDelta::FromHours(1);
+}
+
} // namespace
// Testers -------------------------------------------------------------------
@@ -1170,7 +1174,8 @@ class BrowsingDataRemoverTest : public testing::Test {
TestingBrowserProcess::GetGlobal()->SetLocalState(nullptr);
}
- void BlockUntilBrowsingDataRemoved(browsing_data::TimePeriod period,
+ void BlockUntilBrowsingDataRemoved(const base::Time& delete_begin,
+ const base::Time& delete_end,
int remove_mask,
bool include_protected_origins) {
BrowsingDataRemover* remover =
@@ -1184,8 +1189,9 @@ class BrowsingDataRemoverTest : public testing::Test {
origin_type_mask |= BrowsingDataHelper::PROTECTED_WEB;
BrowsingDataRemoverCompletionObserver completion_observer(remover);
- remover->RemoveAndReply(BrowsingDataRemover::Period(period), remove_mask,
- origin_type_mask, &completion_observer);
+ remover->RemoveAndReply(
+ delete_begin, delete_end, remove_mask, origin_type_mask,
+ &completion_observer);
completion_observer.BlockUntilCompletion();
// Save so we can verify later.
@@ -1194,7 +1200,8 @@ class BrowsingDataRemoverTest : public testing::Test {
}
void BlockUntilOriginDataRemoved(
- browsing_data::TimePeriod period,
+ const base::Time& delete_begin,
+ const base::Time& delete_end,
int remove_mask,
const BrowsingDataFilterBuilder& filter_builder) {
BrowsingDataRemover* remover =
@@ -1203,8 +1210,8 @@ class BrowsingDataRemoverTest : public testing::Test {
remover->OverrideStoragePartitionForTesting(&storage_partition);
BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
- remover->RemoveImpl(BrowsingDataRemover::Period(period), remove_mask,
- filter_builder, BrowsingDataHelper::UNPROTECTED_WEB);
+ remover->RemoveImpl(delete_begin, delete_end, remove_mask, filter_builder,
+ BrowsingDataHelper::UNPROTECTED_WEB);
completion_inhibitor.BlockUntilNearCompletion();
completion_inhibitor.ContinueToCompletion();
@@ -1289,7 +1296,7 @@ class BrowsingDataRemoverTest : public testing::Test {
// Tests ---------------------------------------------------------------------
TEST_F(BrowsingDataRemoverTest, RemoveCookieForever) {
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1305,7 +1312,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveCookieForever) {
}
TEST_F(BrowsingDataRemoverTest, RemoveCookieLastHour) {
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1315,7 +1322,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveCookieLastHour) {
StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
EXPECT_EQ(removal_data.remove_mask,
StoragePartition::REMOVE_DATA_MASK_COOKIES);
- // Removing with time period other than ALL_TIME should not clear
+ // Removing with time period other than all time should not clear
// persistent storage data.
EXPECT_EQ(removal_data.quota_storage_remove_mask,
~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT);
@@ -1327,7 +1334,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveCookiesDomainBlacklist) {
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
filter.AddRegisterableDomain(kTestRegisterableDomain3);
- BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, filter);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1337,7 +1344,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveCookiesDomainBlacklist) {
StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
EXPECT_EQ(removal_data.remove_mask,
StoragePartition::REMOVE_DATA_MASK_COOKIES);
- // Removing with time period other than ALL_TIME should not clear
+ // Removing with time period other than all time should not clear
// persistent storage data.
EXPECT_EQ(removal_data.quota_storage_remove_mask,
~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT);
@@ -1362,7 +1369,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieForever) {
tester.AddCookie();
ASSERT_TRUE(tester.ContainsCookie());
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1376,12 +1383,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieLastHour) {
tester.AddCookie();
ASSERT_TRUE(tester.ContainsCookie());
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
- // Removing with time period other than ALL_TIME should not clear safe
+ // Removing with time period other than all time should not clear safe
// browsing cookies.
EXPECT_TRUE(tester.ContainsCookie());
}
@@ -1394,7 +1401,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieForeverWithPredicate) {
RegistrableDomainFilterBuilder filter(
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, filter);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1404,7 +1411,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieForeverWithPredicate) {
RegistrableDomainFilterBuilder filter2(
RegistrableDomainFilterBuilder::WHITELIST);
filter2.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, filter2);
EXPECT_FALSE(tester.ContainsCookie());
}
@@ -1416,7 +1423,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveChannelIDForever) {
EXPECT_EQ(0, tester.ssl_config_changed_count());
EXPECT_EQ(1, tester.ChannelIDCount());
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_CHANNEL_IDS, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_CHANNEL_IDS, GetRemovalMask());
@@ -1435,7 +1442,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveChannelIDLastHour) {
EXPECT_EQ(0, tester.ssl_config_changed_count());
EXPECT_EQ(2, tester.ChannelIDCount());
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_CHANNEL_IDS, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_CHANNEL_IDS, GetRemovalMask());
@@ -1459,7 +1466,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveChannelIDsForServerIdentifiers) {
RegistrableDomainFilterBuilder::WHITELIST);
filter_builder.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_CHANNEL_IDS,
filter_builder);
@@ -1476,7 +1483,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveUnprotectedLocalStorageForever) {
policy->AddProtected(kOrigin1.GetOrigin());
#endif
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_LOCAL_STORAGE,
false);
@@ -1506,7 +1513,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveProtectedLocalStorageForever) {
policy->AddProtected(kOrigin1.GetOrigin());
#endif
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_LOCAL_STORAGE,
true);
@@ -1535,9 +1542,9 @@ TEST_F(BrowsingDataRemoverTest, RemoveLocalStorageForLastWeek) {
CreateMockPolicy();
#endif
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_WEEK,
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE,
- false);
+ BlockUntilBrowsingDataRemoved(
+ base::Time::Now() - base::TimeDelta::FromDays(7), base::Time::Max(),
+ BrowsingDataRemover::REMOVE_LOCAL_STORAGE, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1565,7 +1572,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveHistoryForever) {
tester.AddHistory(kOrigin1, base::Time::Now());
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
@@ -1584,7 +1591,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveHistoryForLastHour) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin2));
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
@@ -1609,7 +1616,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveHistoryProhibited) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin2));
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1630,7 +1637,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveMultipleTypes) {
int removal_mask = BrowsingDataRemover::REMOVE_HISTORY |
BrowsingDataRemover::REMOVE_COOKIES;
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME, removal_mask, false);
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
+ removal_mask, false);
EXPECT_EQ(removal_mask, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1661,7 +1669,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveMultipleTypesHistoryProhibited) {
int removal_mask = BrowsingDataRemover::REMOVE_HISTORY |
BrowsingDataRemover::REMOVE_COOKIES;
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR, removal_mask, false);
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
+ removal_mask, false);
EXPECT_EQ(removal_mask, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1673,7 +1682,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveMultipleTypesHistoryProhibited) {
StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
EXPECT_EQ(removal_data.remove_mask,
StoragePartition::REMOVE_DATA_MASK_COOKIES);
- // Persistent storage won't be deleted, since ALL_TIME was not specified.
+ // Persistent storage won't be deleted, since the time period is not all time.
EXPECT_EQ(removal_data.quota_storage_remove_mask,
~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT);
}
@@ -1688,7 +1697,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveFaviconsForever) {
favicon_tester.VisitAndAddFavicon(page_url);
ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(page_url));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_FALSE(favicon_tester.HasFaviconForPageURL(page_url));
@@ -1715,7 +1724,7 @@ TEST_F(BrowsingDataRemoverTest, ExpireBookmarkFavicons) {
favicon_tester.VisitAndAddFavicon(bookmarked_page);
ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(bookmarked_page));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_TRUE(favicon_tester.HasExpiredFaviconForPageURL(bookmarked_page));
@@ -1723,7 +1732,7 @@ TEST_F(BrowsingDataRemoverTest, ExpireBookmarkFavicons) {
TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -1760,7 +1769,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
#endif
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -1804,7 +1813,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
#endif
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -1848,7 +1857,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
#endif
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -1891,7 +1900,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverSpecificOrigin) {
RegistrableDomainFilterBuilder::WHITELIST);
builder.AddRegisterableDomain(kTestRegisterableDomain1);
// Remove Origin 1.
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_APPCACHE |
BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
BrowsingDataRemover::REMOVE_CACHE_STORAGE |
@@ -1929,7 +1938,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverSpecificOrigin) {
TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
BlockUntilBrowsingDataRemoved(
- browsing_data::LAST_HOUR,
+ AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -1969,7 +1978,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
BlockUntilBrowsingDataRemoved(
- browsing_data::LAST_WEEK,
+ base::Time::Now() - base::TimeDelta::FromDays(7), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -2015,7 +2024,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
#endif
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
BrowsingDataRemover::REMOVE_WEBSQL |
BrowsingDataRemover::REMOVE_APPCACHE |
@@ -2065,7 +2074,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedSpecificOrigin) {
builder.AddRegisterableDomain(kTestRegisterableDomain1);
// Try to remove kOrigin1. Expect failure.
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_APPCACHE |
BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
BrowsingDataRemover::REMOVE_CACHE_STORAGE |
@@ -2114,7 +2123,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedOrigins) {
// Try to remove kOrigin1. Expect success.
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_APPCACHE |
BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
BrowsingDataRemover::REMOVE_CACHE_STORAGE |
@@ -2159,7 +2168,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedIgnoreExtensionsAndDevTools) {
#endif
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_APPCACHE |
BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
BrowsingDataRemover::REMOVE_CACHE_STORAGE |
@@ -2209,7 +2218,7 @@ TEST_F(BrowsingDataRemoverTest, TimeBasedHistoryRemoval) {
RegistrableDomainFilterBuilder builder(
RegistrableDomainFilterBuilder::BLACKLIST);
- BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, builder);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
@@ -2227,7 +2236,7 @@ TEST_F(BrowsingDataRemoverTest, AutofillRemovalLastHour) {
tester.AddProfilesAndCards();
ASSERT_TRUE(tester.HasProfile());
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FORM_DATA, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_FORM_DATA, GetRemovalMask());
@@ -2243,7 +2252,7 @@ TEST_F(BrowsingDataRemoverTest, AutofillRemovalEverything) {
tester.AddProfilesAndCards();
ASSERT_TRUE(tester.HasProfile());
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_FORM_DATA, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_FORM_DATA, GetRemovalMask());
@@ -2261,7 +2270,7 @@ TEST_F(BrowsingDataRemoverTest, AutofillOriginsRemovedWithHistory) {
EXPECT_TRUE(tester.HasOrigin(kWebOrigin));
EXPECT_TRUE(tester.HasOrigin(autofill::kSettingsOrigin));
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
@@ -2298,7 +2307,7 @@ TEST_F(BrowsingDataRemoverTest, CompletionInhibition) {
BrowsingDataRemover* remover =
BrowsingDataRemoverFactory::GetForBrowserContext(GetProfile());
InspectableCompletionObserver completion_observer(remover);
- remover->RemoveAndReply(BrowsingDataRemover::Unbounded(),
+ remover->RemoveAndReply(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY,
BrowsingDataHelper::UNPROTECTED_WEB,
&completion_observer);
@@ -2328,7 +2337,7 @@ TEST_F(BrowsingDataRemoverTest, EarlyShutdown) {
BrowsingDataRemoverFactory::GetForBrowserContext(GetProfile());
InspectableCompletionObserver completion_observer(remover);
BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
- remover->RemoveAndReply(BrowsingDataRemover::Unbounded(),
+ remover->RemoveAndReply(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY,
BrowsingDataHelper::UNPROTECTED_WEB,
&completion_observer);
@@ -2354,7 +2363,7 @@ TEST_F(BrowsingDataRemoverTest, ZeroSuggestCacheClear) {
PrefService* prefs = GetProfile()->GetPrefs();
prefs->SetString(omnibox::kZeroSuggestCachedResults,
"[\"\", [\"foo\", \"bar\"]]");
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
// Expect the prefs to be cleared when cookies are removed.
@@ -2385,7 +2394,7 @@ TEST_F(BrowsingDataRemoverTest, ContentProtectionPlatformKeysRemoval) {
EXPECT_CALL(*cryptohome_client, TpmAttestationDeleteKeys(_, _, _, _))
.WillOnce(WithArgs<3>(Invoke(FakeDBusCall)));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_MEDIA_LICENSES,
false);
@@ -2404,7 +2413,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons) {
const ClearDomainReliabilityTester& tester =
clear_domain_reliability_tester();
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_BEACONS, tester.last_clear_mode());
@@ -2420,7 +2429,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons_WithFilter) {
RegistrableDomainFilterBuilder::WHITELIST);
builder.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, builder);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_BEACONS, tester.last_clear_mode());
@@ -2432,7 +2441,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts) {
const ClearDomainReliabilityTester& tester =
clear_domain_reliability_tester();
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
@@ -2448,7 +2457,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts_WithFilter) {
RegistrableDomainFilterBuilder::WHITELIST);
builder.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, builder);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
@@ -2461,7 +2470,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ContextsWin) {
clear_domain_reliability_tester();
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY | BrowsingDataRemover::REMOVE_COOKIES,
false);
EXPECT_EQ(1u, tester.clear_count());
@@ -2472,7 +2481,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ProtectedOrigins) {
const ClearDomainReliabilityTester& tester =
clear_domain_reliability_tester();
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, true);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
@@ -2484,7 +2493,7 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ProtectedOrigins) {
// monitor case again.
TEST_F(BrowsingDataRemoverTest, DISABLED_DomainReliability_NoMonitor) {
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY | BrowsingDataRemover::REMOVE_COOKIES,
false);
}
@@ -2498,7 +2507,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveDownloadsByTimeOnly) {
*tester.download_manager(),
RemoveDownloadsByURLAndTime(ProbablySameFilter(filter), _, _));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_DOWNLOADS, false);
}
@@ -2513,7 +2522,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveDownloadsByOrigin) {
*tester.download_manager(),
RemoveDownloadsByURLAndTime(ProbablySameFilter(filter), _, _));
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_DOWNLOADS, builder);
}
@@ -2524,7 +2533,7 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordStatistics) {
EXPECT_CALL(*tester.store(), RemoveStatisticsByOriginAndTimeImpl(
ProbablySameFilter(empty_filter),
base::Time(), base::Time::Max()));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
}
@@ -2539,7 +2548,7 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordStatisticsByOrigin) {
EXPECT_CALL(*tester.store(),
RemoveStatisticsByOriginAndTimeImpl(
ProbablySameFilter(filter), base::Time(), base::Time::Max()));
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, builder);
}
@@ -2551,7 +2560,7 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordsByTimeOnly) {
EXPECT_CALL(*tester.store(),
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_PASSWORDS, false);
}
@@ -2565,7 +2574,7 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordsByOrigin) {
EXPECT_CALL(*tester.store(),
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_PASSWORDS, builder);
}
@@ -2579,7 +2588,7 @@ TEST_F(BrowsingDataRemoverTest, DisableAutoSignIn) {
DisableAutoSignInForOriginsImpl(ProbablySameFilter(empty_filter)))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
}
@@ -2595,7 +2604,7 @@ TEST_F(BrowsingDataRemoverTest, DisableAutoSignInAfterRemovingPasswords) {
DisableAutoSignInForOriginsImpl(ProbablySameFilter(empty_filter)))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES |
BrowsingDataRemover::REMOVE_PASSWORDS,
false);
@@ -2623,7 +2632,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveContentSettingsWithBlacklist) {
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
filter.AddRegisterableDomain(kTestRegisterableDomain3);
- BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
filter);
@@ -2662,7 +2671,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveDurablePermission) {
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
filter.AddRegisterableDomain(kTestRegisterableDomain3);
- BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_DURABLE_PERMISSION,
filter);
@@ -2706,7 +2715,7 @@ TEST_F(BrowsingDataRemoverTest, ClearHttpAuthCache_RemoveCookies) {
CHECK(http_auth_cache->Lookup(kOrigin1, kTestRealm,
net::HttpAuth::AUTH_SCHEME_BASIC));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES, false);
EXPECT_EQ(nullptr, http_auth_cache->Lookup(kOrigin1, kTestRealm,
@@ -2731,7 +2740,7 @@ TEST_F(BrowsingDataRemoverTest, ClearHttpAuthCache_RemovePasswords) {
CHECK(http_auth_cache->Lookup(kOrigin1, kTestRealm,
net::HttpAuth::AUTH_SCHEME_BASIC));
- BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_PASSWORDS, false);
EXPECT_EQ(nullptr, http_auth_cache->Lookup(kOrigin1, kTestRealm,
@@ -2764,7 +2773,7 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
tester.ShouldChangeDismissalToBlock(kOrigin2,
content::PermissionType::NOTIFICATIONS);
- BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
filter_builder_1);
@@ -2780,7 +2789,7 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
EXPECT_EQ(1, tester.GetDismissCount(
kOrigin2, content::PermissionType::NOTIFICATIONS));
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
// Everything should be gone.
@@ -2810,7 +2819,7 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
tester.ShouldChangeDismissalToBlock(kOrigin2,
content::PermissionType::NOTIFICATIONS);
- BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
filter_builder_2);
@@ -2826,7 +2835,7 @@ TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) {
EXPECT_EQ(0, tester.GetDismissCount(
kOrigin2, content::PermissionType::NOTIFICATIONS));
- BlockUntilBrowsingDataRemoved(browsing_data::LAST_HOUR,
+ BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
false);
@@ -2860,7 +2869,7 @@ TEST_F(BrowsingDataRemoverTest, RemovePluginData) {
RegistrableDomainFilterBuilder filter_builder(
RegistrableDomainFilterBuilder::WHITELIST);
filter_builder.AddRegisterableDomain(kTestRegisterableDomain3);
- BlockUntilOriginDataRemoved(browsing_data::ALL_TIME,
+ BlockUntilOriginDataRemoved(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_PLUGIN_DATA,
filter_builder);
@@ -2945,33 +2954,32 @@ TEST_F(BrowsingDataRemoverTest, MultipleTasks) {
// Test several tasks with various configuration of masks, filters, and target
// observers.
std::list<BrowsingDataRemover::RemovalTask> tasks;
- tasks.emplace_back(BrowsingDataRemover::Unbounded(),
+ tasks.emplace_back(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY,
BrowsingDataHelper::UNPROTECTED_WEB,
base::MakeUnique<RegistrableDomainFilterBuilder>(
RegistrableDomainFilterBuilder::BLACKLIST),
observer.target_a());
- tasks.emplace_back(BrowsingDataRemover::Unbounded(),
+ tasks.emplace_back(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES,
BrowsingDataHelper::PROTECTED_WEB,
base::MakeUnique<RegistrableDomainFilterBuilder>(
RegistrableDomainFilterBuilder::BLACKLIST),
nullptr);
tasks.emplace_back(
- BrowsingDataRemover::TimeRange(base::Time::Now(), base::Time::Max()),
+ base::Time::Now(), base::Time::Max(),
BrowsingDataRemover::REMOVE_PASSWORDS, BrowsingDataHelper::ALL,
base::MakeUnique<RegistrableDomainFilterBuilder>(
RegistrableDomainFilterBuilder::BLACKLIST),
observer.target_b());
tasks.emplace_back(
- BrowsingDataRemover::TimeRange(base::Time(), base::Time::UnixEpoch()),
+ base::Time(), base::Time::UnixEpoch(),
BrowsingDataRemover::REMOVE_WEBSQL,
BrowsingDataHelper::UNPROTECTED_WEB,
std::move(filter_builder_1),
observer.target_b());
tasks.emplace_back(
- BrowsingDataRemover::TimeRange(
- base::Time::UnixEpoch(), base::Time::Now()),
+ base::Time::UnixEpoch(), base::Time::Now(),
BrowsingDataRemover::REMOVE_CHANNEL_IDS,
BrowsingDataHelper::ALL,
std::move(filter_builder_2),
@@ -2983,17 +2991,19 @@ TEST_F(BrowsingDataRemoverTest, MultipleTasks) {
// Remove.* instead. This also serves as a test that those methods are all
// correctly reduced to RemoveInternal().
if (!task.observer && task.filter_builder->IsEmptyBlacklist()) {
- remover->Remove(task.time_range, task.remove_mask, task.origin_type_mask);
+ remover->Remove(task.delete_begin, task.delete_end,
+ task.remove_mask, task.origin_type_mask);
} else if (task.filter_builder->IsEmptyBlacklist()) {
- remover->RemoveAndReply(task.time_range, task.remove_mask,
- task.origin_type_mask, task.observer);
+ remover->RemoveAndReply(task.delete_begin, task.delete_end,
+ task.remove_mask, task.origin_type_mask,
+ task.observer);
} else if (!task.observer) {
- remover->RemoveWithFilter(task.time_range, task.remove_mask,
- task.origin_type_mask,
+ remover->RemoveWithFilter(task.delete_begin, task.delete_end,
+ task.remove_mask, task.origin_type_mask,
std::move(task.filter_builder));
} else {
- remover->RemoveWithFilterAndReply(task.time_range, task.remove_mask,
- task.origin_type_mask,
+ remover->RemoveWithFilterAndReply(task.delete_begin, task.delete_end,
+ task.remove_mask, task.origin_type_mask,
std::move(task.filter_builder),
task.observer);
}
@@ -3016,7 +3026,7 @@ TEST_F(BrowsingDataRemoverTest, MultipleTasks) {
// filter builder and exposed it, we could also test it here. Make it so.
EXPECT_EQ(task.remove_mask, GetRemovalMask());
EXPECT_EQ(task.origin_type_mask, GetOriginTypeMask());
- EXPECT_EQ(task.time_range.begin, GetBeginTime());
+ EXPECT_EQ(task.delete_begin, GetBeginTime());
}
EXPECT_FALSE(remover->is_removing());
@@ -3051,7 +3061,7 @@ TEST_F(BrowsingDataRemoverTest, MultipleTasksInQuickSuccession) {
};
for (int removal_mask : test_removal_masks) {
- remover->Remove(BrowsingDataRemover::Unbounded(), removal_mask,
+ remover->Remove(base::Time(), base::Time::Max(), removal_mask,
BrowsingDataHelper::UNPROTECTED_WEB);
}
@@ -3059,7 +3069,7 @@ TEST_F(BrowsingDataRemoverTest, MultipleTasksInQuickSuccession) {
// Add one more deletion and wait for it.
BlockUntilBrowsingDataRemoved(
- browsing_data::ALL_TIME,
+ base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_COOKIES,
BrowsingDataHelper::UNPROTECTED_WEB);
@@ -3103,7 +3113,7 @@ TEST_F(BrowsingDataRemoverTest, BookmarkLastVisitDatesGetCleared) {
BrowsingDataRemoverFactory::GetForBrowserContext(&profile);
BrowsingDataRemoverCompletionObserver completion_observer(remover);
- remover->RemoveAndReply(BrowsingDataRemover::Unbounded(),
+ remover->RemoveAndReply(base::Time(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY,
BrowsingDataHelper::ALL, &completion_observer);
completion_observer.BlockUntilCompletion();
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_browsertest.cc ('k') | chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698