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

Unified Diff: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Issue 2671743002: Separate state of basic and advanced tab in CBD dialog (Closed)
Patch Set: rebase and fix 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/extensions/api/browsing_data/browsing_data_test.cc
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index 10efc181e6f5a1ba97de01b749ee94a4f69d15c5..9a908878869e10c4ab7d8144c2fab1e5409fa298 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -120,7 +120,8 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {
void SetSinceAndVerify(browsing_data::TimePeriod since_pref) {
PrefService* prefs = browser()->profile()->GetPrefs();
- prefs->SetInteger(browsing_data::prefs::kDeleteTimePeriod, since_pref);
+ prefs->SetInteger(browsing_data::prefs::kDeleteTimePeriod,
+ static_cast<int>(since_pref));
scoped_refptr<BrowsingDataSettingsFunction> function =
new BrowsingDataSettingsFunction();
@@ -136,7 +137,7 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {
EXPECT_TRUE(options->GetDouble("since", &since));
double expected_since = 0;
- if (since_pref != browsing_data::ALL_TIME) {
+ if (since_pref != browsing_data::TimePeriod::ALL_TIME) {
base::Time time = CalculateBeginDeleteTime(since_pref);
expected_since = time.ToJsTime();
}
@@ -456,11 +457,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, ShortcutFunctionRemovalMask) {
// Test the processing of the 'delete since' preference.
IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSince) {
- SetSinceAndVerify(browsing_data::ALL_TIME);
- SetSinceAndVerify(browsing_data::LAST_HOUR);
- SetSinceAndVerify(browsing_data::LAST_DAY);
- SetSinceAndVerify(browsing_data::LAST_WEEK);
- SetSinceAndVerify(browsing_data::FOUR_WEEKS);
+ SetSinceAndVerify(browsing_data::TimePeriod::ALL_TIME);
+ SetSinceAndVerify(browsing_data::TimePeriod::LAST_HOUR);
+ SetSinceAndVerify(browsing_data::TimePeriod::LAST_DAY);
+ SetSinceAndVerify(browsing_data::TimePeriod::LAST_WEEK);
+ SetSinceAndVerify(browsing_data::TimePeriod::FOUR_WEEKS);
}
IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionEmpty) {
« no previous file with comments | « chrome/browser/extensions/api/browsing_data/browsing_data_api.cc ('k') | chrome/browser/net/sdch_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698