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

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

Issue 2671743002: Separate state of basic and advanced tab in CBD dialog (Closed)
Patch Set: fix .classpath file 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/history_counter_browsertest.cc
diff --git a/chrome/browser/browsing_data/history_counter_browsertest.cc b/chrome/browser/browsing_data/history_counter_browsertest.cc
index 2fcb864fe3d0edcc24552ce350ea30a79c8fefbd..505ed656ab4f08d597877e2036d277518cbcc415 100644
--- a/chrome/browser/browsing_data/history_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/history_counter_browsertest.cc
@@ -181,8 +181,10 @@ IN_PROC_BROWSER_TEST_F(HistoryCounterTest, DuplicateVisits) {
base::Unretained(profile)),
ProfileSyncServiceFactory::GetForProfile(profile));
- counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
- base::Unretained(this)));
+ counter.Init(
+ profile->GetPrefs(),
+ browsing_data::ClearBrowsingDataPreferenceType::DEFAULT,
+ base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
counter.Restart();
WaitForCounting();
@@ -205,8 +207,10 @@ IN_PROC_BROWSER_TEST_F(HistoryCounterTest, PrefChanged) {
base::Unretained(profile)),
ProfileSyncServiceFactory::GetForProfile(profile));
- counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
- base::Unretained(this)));
+ counter.Init(
+ profile->GetPrefs(),
+ browsing_data::ClearBrowsingDataPreferenceType::DEFAULT,
+ base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
SetHistoryDeletionPref(true);
WaitForCounting();
@@ -246,8 +250,10 @@ IN_PROC_BROWSER_TEST_F(HistoryCounterTest, PeriodChanged) {
base::Unretained(profile)),
ProfileSyncServiceFactory::GetForProfile(profile));
- counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
- base::Unretained(this)));
+ counter.Init(
+ profile->GetPrefs(),
+ browsing_data::ClearBrowsingDataPreferenceType::DEFAULT,
+ base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
SetDeletionPeriodPref(browsing_data::LAST_HOUR);
WaitForCounting();
@@ -284,8 +290,10 @@ IN_PROC_BROWSER_TEST_F(HistoryCounterTest, Synced) {
false),
ProfileSyncServiceFactory::GetForProfile(profile));
- counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
- base::Unretained(this)));
+ counter.Init(
+ profile->GetPrefs(),
+ browsing_data::ClearBrowsingDataPreferenceType::DEFAULT,
+ base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
history::FakeWebHistoryService* service =
static_cast<history::FakeWebHistoryService*>(GetFakeWebHistoryService(
@@ -375,8 +383,10 @@ IN_PROC_BROWSER_TEST_F(HistoryCounterTest, DISABLED_RestartOnSyncChange) {
true),
sync_service);
- counter.Init(profile->GetPrefs(), base::Bind(&HistoryCounterTest::Callback,
- base::Unretained(this)));
+ counter.Init(
+ profile->GetPrefs(),
+ browsing_data::ClearBrowsingDataPreferenceType::DEFAULT,
+ base::Bind(&HistoryCounterTest::Callback, base::Unretained(this)));
// Note that some Sync operations notify observers immediately (and thus there
// is no need to call |WaitForCounting()|; in fact, it would block the test),

Powered by Google App Engine
This is Rietveld 408576698