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

Unified Diff: base/prefs/public/pref_change_registrar_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 | « no previous file | base/prefs/public/pref_member_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/public/pref_change_registrar_unittest.cc
diff --git a/base/prefs/public/pref_change_registrar_unittest.cc b/base/prefs/public/pref_change_registrar_unittest.cc
index d194c3673a8af85cc6d88a725082f2ae6893d26f..185c9ded71117d537088316dcd6e21a240399720 100644
--- a/base/prefs/public/pref_change_registrar_unittest.cc
+++ b/base/prefs/public/pref_change_registrar_unittest.cc
@@ -21,7 +21,7 @@ const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
const char kApplicationLocale[] = "intl.app_locale";
// A mock provider that allows us to capture pref observer changes.
-class MockPrefService : public TestingPrefService {
+class MockPrefService : public TestingPrefServiceSimple {
public:
MockPrefService() {}
virtual ~MockPrefService() {}
@@ -127,16 +127,10 @@ TEST_F(PrefChangeRegistrarTest, RemoveAll) {
class ObserveSetOfPreferencesTest : public testing::Test {
public:
virtual void SetUp() {
- pref_service_.reset(new TestingPrefService);
- pref_service_->RegisterStringPref(kHomePage,
- "http://google.com",
- PrefService::UNSYNCABLE_PREF);
- pref_service_->RegisterBooleanPref(kHomePageIsNewTabPage,
- false,
- PrefService::UNSYNCABLE_PREF);
- pref_service_->RegisterStringPref(kApplicationLocale,
- "",
- PrefService::UNSYNCABLE_PREF);
+ pref_service_.reset(new TestingPrefServiceSimple);
+ pref_service_->RegisterStringPref(kHomePage, "http://google.com");
+ pref_service_->RegisterBooleanPref(kHomePageIsNewTabPage, false);
+ pref_service_->RegisterStringPref(kApplicationLocale, "");
}
PrefChangeRegistrar* CreatePrefChangeRegistrar() {
@@ -150,7 +144,7 @@ class ObserveSetOfPreferencesTest : public testing::Test {
MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));
- scoped_ptr<TestingPrefService> pref_service_;
+ scoped_ptr<TestingPrefServiceSimple> pref_service_;
};
TEST_F(ObserveSetOfPreferencesTest, IsObserved) {
« no previous file with comments | « no previous file | base/prefs/public/pref_member_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698