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

Unified Diff: chrome/browser/about_flags_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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 | « base/prefs/public/pref_service_base.h ('k') | chrome/browser/accessibility/invert_bubble_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags_unittest.cc
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 2cde57e045f187e4490612ba9f640d4a4582fcbb..cff2597aade89476c032d6c726db880e42258f66 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -86,8 +86,7 @@ static Experiment kExperiments[] = {
class AboutFlagsTest : public ::testing::Test {
protected:
AboutFlagsTest() {
- prefs_.RegisterListPref(prefs::kEnabledLabsExperiments,
- PrefService::UNSYNCABLE_PREF);
+ prefs_.RegisterListPref(prefs::kEnabledLabsExperiments);
testing::ClearState();
}
@@ -107,7 +106,7 @@ class AboutFlagsTest : public ::testing::Test {
testing::SetExperiments(NULL, 0);
}
- TestingPrefService prefs_;
+ TestingPrefServiceSimple prefs_;
};
TEST_F(AboutFlagsTest, ChangeNeedsRestart) {
@@ -261,7 +260,7 @@ TEST_F(AboutFlagsTest, CheckValues) {
std::string switch2_with_equals = std::string("--") +
std::string(kSwitch2) +
std::string("=");
-#if defined(OS_WIN)
+#if defined(OS_WIN)
EXPECT_NE(std::wstring::npos,
command_line.GetCommandLineString().find(
ASCIIToWide(switch2_with_equals)));
« no previous file with comments | « base/prefs/public/pref_service_base.h ('k') | chrome/browser/accessibility/invert_bubble_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698