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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2084903002: Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed deps Created 4 years, 6 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.cc ('k') | chrome/browser/browsing_data/cache_counter.h » ('j') | chrome/browser/browsing_data/passwords_counter.h » ('J')
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 b2855bd85cc041e65975bb0b8dd65b149b42bb51..8c87b658be8b7411c0384f7959c64f84f25ae771 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -52,6 +52,7 @@
#include "components/autofill/core/common/autofill_constants.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/browsing_data/browsing_data_utils.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
@@ -1035,7 +1036,7 @@ class BrowsingDataRemoverTest : public testing::Test {
TestingBrowserProcess::GetGlobal()->SetLocalState(nullptr);
}
- void BlockUntilBrowsingDataRemoved(BrowsingDataRemover::TimePeriod period,
+ void BlockUntilBrowsingDataRemoved(TimePeriod period,
int remove_mask,
bool include_protected_origins) {
BrowsingDataRemover* remover =
@@ -1051,8 +1052,7 @@ class BrowsingDataRemoverTest : public testing::Test {
origin_type_mask |= BrowsingDataHelper::PROTECTED_WEB;
BrowsingDataRemoverCompletionObserver completion_observer(remover);
- remover->Remove(BrowsingDataRemover::Period(period), remove_mask,
- origin_type_mask);
+ remover->Remove(Period(period), remove_mask, origin_type_mask);
completion_observer.BlockUntilCompletion();
// Save so we can verify later.
@@ -1061,7 +1061,7 @@ class BrowsingDataRemoverTest : public testing::Test {
}
void BlockUntilOriginDataRemoved(
- BrowsingDataRemover::TimePeriod period,
+ TimePeriod period,
int remove_mask,
const BrowsingDataFilterBuilder& filter_builder) {
BrowsingDataRemover* remover =
@@ -1072,8 +1072,8 @@ class BrowsingDataRemoverTest : public testing::Test {
called_with_details_.reset(new BrowsingDataRemover::NotificationDetails());
BrowsingDataRemoverCompletionObserver completion_observer(remover);
- remover->RemoveImpl(BrowsingDataRemover::Period(period), remove_mask,
- filter_builder, BrowsingDataHelper::UNPROTECTED_WEB);
+ remover->RemoveImpl(Period(period), remove_mask, filter_builder,
+ BrowsingDataHelper::UNPROTECTED_WEB);
completion_observer.BlockUntilCompletion();
// Save so we can verify later.
@@ -1171,8 +1171,7 @@ class BrowsingDataRemoverTest : public testing::Test {
// Tests ---------------------------------------------------------------------
TEST_F(BrowsingDataRemoverTest, RemoveCookieForever) {
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES,
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1188,8 +1187,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveCookieForever) {
}
TEST_F(BrowsingDataRemoverTest, RemoveCookieLastHour) {
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_COOKIES,
+ BlockUntilBrowsingDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_COOKIES,
false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
@@ -1211,8 +1209,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveCookiesDomainBlacklist) {
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
filter.AddRegisterableDomain(kTestRegisterableDomain3);
- BlockUntilOriginDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_COOKIES, filter);
+ BlockUntilOriginDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_COOKIES,
+ filter);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1246,8 +1244,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieForever) {
tester.AddCookie();
ASSERT_TRUE(tester.ContainsCookie());
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1260,8 +1258,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieLastHour) {
tester.AddCookie();
ASSERT_TRUE(tester.ContainsCookie());
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_COOKIES,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1278,8 +1276,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieForeverWithPredicate) {
RegistrableDomainFilterBuilder filter(
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES, filter);
+ BlockUntilOriginDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
+ filter);
EXPECT_EQ(BrowsingDataRemover::REMOVE_COOKIES, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1288,8 +1286,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveSafeBrowsingCookieForeverWithPredicate) {
RegistrableDomainFilterBuilder filter2(
RegistrableDomainFilterBuilder::WHITELIST);
filter2.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES, filter2);
+ BlockUntilOriginDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
+ filter2);
EXPECT_FALSE(tester.ContainsCookie());
}
@@ -1300,8 +1298,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveChannelIDForever) {
EXPECT_EQ(0, tester.ssl_config_changed_count());
EXPECT_EQ(1, tester.ChannelIDCount());
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING,
+ BrowsingDataRemover::REMOVE_CHANNEL_IDS, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_CHANNEL_IDS, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1319,8 +1317,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveChannelIDLastHour) {
EXPECT_EQ(0, tester.ssl_config_changed_count());
EXPECT_EQ(2, tester.ChannelIDCount());
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR,
+ BrowsingDataRemover::REMOVE_CHANNEL_IDS, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_CHANNEL_IDS, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1343,8 +1341,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveChannelIDsForServerIdentifiers) {
RegistrableDomainFilterBuilder::WHITELIST);
filter_builder.AddRegisterableDomain(kTestRegisterableDomain1);
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_CHANNEL_IDS, filter_builder);
+ BlockUntilOriginDataRemoved(
+ EVERYTHING, BrowsingDataRemover::REMOVE_CHANNEL_IDS, filter_builder);
EXPECT_EQ(1, tester.ChannelIDCount());
net::ChannelIDStore::ChannelIDList channel_ids;
@@ -1359,9 +1357,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveUnprotectedLocalStorageForever) {
policy->AddProtected(kOrigin1.GetOrigin());
#endif
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE,
- false);
+ BlockUntilBrowsingDataRemoved(
+ EVERYTHING, BrowsingDataRemover::REMOVE_LOCAL_STORAGE, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1389,9 +1386,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveProtectedLocalStorageForever) {
policy->AddProtected(kOrigin1.GetOrigin());
#endif
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE,
- true);
+ BlockUntilBrowsingDataRemoved(
+ EVERYTHING, BrowsingDataRemover::REMOVE_LOCAL_STORAGE, true);
EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB |
@@ -1418,9 +1414,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveLocalStorageForLastWeek) {
CreateMockPolicy();
#endif
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_WEEK,
- BrowsingDataRemover::REMOVE_LOCAL_STORAGE,
- false);
+ BlockUntilBrowsingDataRemoved(
+ LAST_WEEK, BrowsingDataRemover::REMOVE_LOCAL_STORAGE, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_LOCAL_STORAGE, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1448,8 +1443,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveHistoryForever) {
tester.AddHistory(kOrigin1, base::Time::Now());
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1467,8 +1462,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveHistoryForLastHour) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin2));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1492,8 +1487,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveHistoryProhibited) {
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin1));
ASSERT_TRUE(tester.HistoryContainsURL(kOrigin2));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1513,8 +1508,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveMultipleTypes) {
int removal_mask = BrowsingDataRemover::REMOVE_HISTORY |
BrowsingDataRemover::REMOVE_COOKIES;
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- removal_mask, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, removal_mask, false);
EXPECT_EQ(removal_mask, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1545,8 +1539,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveMultipleTypesHistoryProhibited) {
int removal_mask = BrowsingDataRemover::REMOVE_HISTORY |
BrowsingDataRemover::REMOVE_COOKIES;
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
- removal_mask, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR, removal_mask, false);
EXPECT_EQ(removal_mask, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -1573,8 +1566,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveFaviconsForever) {
favicon_tester.VisitAndAddFavicon(page_url);
ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(page_url));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_FALSE(favicon_tester.HasFaviconForPageURL(page_url));
}
@@ -1600,21 +1593,20 @@ TEST_F(BrowsingDataRemoverTest, ExpireBookmarkFavicons) {
favicon_tester.VisitAndAddFavicon(bookmarked_page);
ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(bookmarked_page));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_TRUE(favicon_tester.HasExpiredFaviconForPageURL(bookmarked_page));
}
TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ EVERYTHING, 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 |
@@ -1645,13 +1637,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
#endif
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ EVERYTHING, 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 |
@@ -1689,13 +1680,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
#endif
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ EVERYTHING, 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 |
@@ -1733,13 +1723,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
#endif
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ EVERYTHING, 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 |
@@ -1776,7 +1765,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverSpecificOrigin) {
RegistrableDomainFilterBuilder::WHITELIST);
builder.AddRegisterableDomain(kTestRegisterableDomain1);
// Remove Origin 1.
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
+ BlockUntilOriginDataRemoved(EVERYTHING,
BrowsingDataRemover::REMOVE_APPCACHE |
BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
BrowsingDataRemover::REMOVE_CACHE_STORAGE |
@@ -1814,13 +1803,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverSpecificOrigin) {
TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ LAST_HOUR, 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 |
@@ -1854,13 +1842,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::LAST_WEEK,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ LAST_WEEK, 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 |
@@ -1900,13 +1887,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
#endif
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_WEBSQL |
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_INDEXEDDB,
+ EVERYTHING, 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 |
@@ -1950,7 +1936,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedSpecificOrigin) {
builder.AddRegisterableDomain(kTestRegisterableDomain1);
// Try to remove kOrigin1. Expect failure.
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
+ BlockUntilOriginDataRemoved(EVERYTHING,
BrowsingDataRemover::REMOVE_APPCACHE |
BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
BrowsingDataRemover::REMOVE_CACHE_STORAGE |
@@ -1999,13 +1985,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedOrigins) {
// Try to remove kOrigin1. Expect success.
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_INDEXEDDB |
- BrowsingDataRemover::REMOVE_WEBSQL,
+ EVERYTHING, 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 |
@@ -2044,13 +2029,12 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedIgnoreExtensionsAndDevTools) {
#endif
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_APPCACHE |
- BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
- BrowsingDataRemover::REMOVE_CACHE_STORAGE |
- BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
- BrowsingDataRemover::REMOVE_INDEXEDDB |
- BrowsingDataRemover::REMOVE_WEBSQL,
+ EVERYTHING, 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 |
@@ -2094,8 +2078,8 @@ TEST_F(BrowsingDataRemoverTest, TimeBasedHistoryRemoval) {
RegistrableDomainFilterBuilder builder(
RegistrableDomainFilterBuilder::BLACKLIST);
- BlockUntilOriginDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_HISTORY, builder);
+ BlockUntilOriginDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_HISTORY,
+ builder);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -2112,9 +2096,8 @@ TEST_F(BrowsingDataRemoverTest, AutofillRemovalLastHour) {
tester.AddProfilesAndCards();
ASSERT_TRUE(tester.HasProfile());
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_FORM_DATA, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR,
+ BrowsingDataRemover::REMOVE_FORM_DATA, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_FORM_DATA, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -2129,9 +2112,8 @@ TEST_F(BrowsingDataRemoverTest, AutofillRemovalEverything) {
tester.AddProfilesAndCards();
ASSERT_TRUE(tester.HasProfile());
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_FORM_DATA, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING,
+ BrowsingDataRemover::REMOVE_FORM_DATA, false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_FORM_DATA, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -2148,9 +2130,8 @@ TEST_F(BrowsingDataRemoverTest, AutofillOriginsRemovedWithHistory) {
EXPECT_TRUE(tester.HasOrigin(kWebOrigin));
EXPECT_TRUE(tester.HasOrigin(autofill::kSettingsOrigin));
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(LAST_HOUR, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
@@ -2168,8 +2149,7 @@ TEST_F(BrowsingDataRemoverTest, CompletionInhibition) {
BrowsingDataRemover* remover =
BrowsingDataRemoverFactory::GetForBrowserContext(GetProfile());
- remover->Remove(BrowsingDataRemover::Unbounded(),
- BrowsingDataRemover::REMOVE_HISTORY,
+ remover->Remove(Unbounded(), BrowsingDataRemover::REMOVE_HISTORY,
BrowsingDataHelper::UNPROTECTED_WEB);
// Process messages until the inhibitor is notified, and then some, to make
@@ -2199,8 +2179,7 @@ TEST_F(BrowsingDataRemoverTest, EarlyShutdown) {
BrowsingDataRemoverFactory::GetForBrowserContext(GetProfile());
BrowsingDataRemoverCompletionObserver completion_observer(remover);
BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
- remover->Remove(BrowsingDataRemover::Unbounded(),
- BrowsingDataRemover::REMOVE_HISTORY,
+ remover->Remove(Unbounded(), BrowsingDataRemover::REMOVE_HISTORY,
BrowsingDataHelper::UNPROTECTED_WEB);
completion_inhibitor.BlockUntilNearCompletion();
@@ -2224,8 +2203,7 @@ TEST_F(BrowsingDataRemoverTest, ZeroSuggestCacheClear) {
PrefService* prefs = GetProfile()->GetPrefs();
prefs->SetString(omnibox::kZeroSuggestCachedResults,
"[\"\", [\"foo\", \"bar\"]]");
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES,
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
false);
// Expect the prefs to be cleared when cookies are removed.
@@ -2257,8 +2235,7 @@ TEST_F(BrowsingDataRemoverTest, ContentProtectionPlatformKeysRemoval) {
.WillOnce(WithArgs<3>(Invoke(FakeDBusCall)));
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_CONTENT_LICENSES, false);
+ EVERYTHING, BrowsingDataRemover::REMOVE_CONTENT_LICENSES, false);
chromeos::DBusThreadManager::Shutdown();
}
@@ -2275,9 +2252,8 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons) {
const ClearDomainReliabilityTester& tester =
clear_domain_reliability_tester();
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_BEACONS, tester.last_clear_mode());
}
@@ -2286,9 +2262,8 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts) {
const ClearDomainReliabilityTester& tester =
clear_domain_reliability_tester();
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
+ false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
}
@@ -2298,9 +2273,9 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ContextsWin) {
clear_domain_reliability_tester();
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY |
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ EVERYTHING,
+ BrowsingDataRemover::REMOVE_HISTORY | BrowsingDataRemover::REMOVE_COOKIES,
+ false);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
}
@@ -2309,9 +2284,8 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ProtectedOrigins) {
const ClearDomainReliabilityTester& tester =
clear_domain_reliability_tester();
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES, true);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
+ true);
EXPECT_EQ(1u, tester.clear_count());
EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
}
@@ -2322,9 +2296,9 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ProtectedOrigins) {
// monitor case again.
TEST_F(BrowsingDataRemoverTest, DISABLED_DomainReliability_NoMonitor) {
BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY |
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ EVERYTHING,
+ BrowsingDataRemover::REMOVE_HISTORY | BrowsingDataRemover::REMOVE_COOKIES,
+ false);
}
TEST_F(BrowsingDataRemoverTest, RemoveDownloadsByTimeOnly) {
@@ -2336,7 +2310,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveDownloadsByTimeOnly) {
*tester.download_manager(),
RemoveDownloadsByURLAndTime(ProbablySameFilter(filter), _, _));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
+ BlockUntilBrowsingDataRemoved(EVERYTHING,
BrowsingDataRemover::REMOVE_DOWNLOADS, false);
}
@@ -2351,8 +2325,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveDownloadsByOrigin) {
*tester.download_manager(),
RemoveDownloadsByURLAndTime(ProbablySameFilter(filter), _, _));
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_DOWNLOADS, builder);
+ BlockUntilOriginDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_DOWNLOADS,
+ builder);
}
TEST_F(BrowsingDataRemoverTest, RemovePasswordStatistics) {
@@ -2360,9 +2334,8 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordStatistics) {
EXPECT_CALL(*tester.store(), RemoveStatisticsCreatedBetweenImpl(
base::Time(), base::Time::Max()));
- BlockUntilBrowsingDataRemoved(
- BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_HISTORY, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_HISTORY,
+ false);
}
TEST_F(BrowsingDataRemoverTest, RemovePasswordsByTimeOnly) {
@@ -2373,7 +2346,7 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordsByTimeOnly) {
EXPECT_CALL(*tester.store(),
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
+ BlockUntilBrowsingDataRemoved(EVERYTHING,
BrowsingDataRemover::REMOVE_PASSWORDS, false);
}
@@ -2387,8 +2360,8 @@ TEST_F(BrowsingDataRemoverTest, RemovePasswordsByOrigin) {
EXPECT_CALL(*tester.store(),
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_PASSWORDS, builder);
+ BlockUntilOriginDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_PASSWORDS,
+ builder);
}
TEST_F(BrowsingDataRemoverTest, DisableAutoSignIn) {
@@ -2397,8 +2370,8 @@ TEST_F(BrowsingDataRemoverTest, DisableAutoSignIn) {
EXPECT_CALL(*tester.store(), DisableAutoSignInForAllLoginsImpl())
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
- BrowsingDataRemover::REMOVE_COOKIES, false);
+ BlockUntilBrowsingDataRemoved(EVERYTHING, BrowsingDataRemover::REMOVE_COOKIES,
+ false);
}
TEST_F(BrowsingDataRemoverTest, DisableAutoSignInAfterRemovingPasswords) {
@@ -2409,7 +2382,7 @@ TEST_F(BrowsingDataRemoverTest, DisableAutoSignInAfterRemovingPasswords) {
EXPECT_CALL(*tester.store(), DisableAutoSignInForAllLoginsImpl())
.WillOnce(Return(password_manager::PasswordStoreChangeList()));
- BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
+ BlockUntilBrowsingDataRemoved(EVERYTHING,
BrowsingDataRemover::REMOVE_COOKIES |
BrowsingDataRemover::REMOVE_PASSWORDS,
false);
@@ -2437,9 +2410,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveContentSettingsWithBlacklist) {
RegistrableDomainFilterBuilder::BLACKLIST);
filter.AddRegisterableDomain(kTestRegisterableDomain1);
filter.AddRegisterableDomain(kTestRegisterableDomain3);
- BlockUntilOriginDataRemoved(BrowsingDataRemover::LAST_HOUR,
- BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
- filter);
+ BlockUntilOriginDataRemoved(
+ LAST_HOUR, BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, filter);
EXPECT_EQ(BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, GetRemovalMask());
EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/browser/browsing_data/cache_counter.h » ('j') | chrome/browser/browsing_data/passwords_counter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698