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

Unified Diff: chrome/browser/prefs/scoped_user_pref_update_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 | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/browser/prefs/session_startup_pref.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/scoped_user_pref_update_unittest.cc
diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
index c06d5ef945524403cc360d37bf140e744fde746d..05e9c846a36b382eecf3034cc42798df2a34b5a3 100644
--- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
+++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
@@ -19,7 +19,8 @@ class ScopedUserPrefUpdateTest : public testing::Test {
protected:
virtual void SetUp() {
- prefs_.RegisterDictionaryPref(kPref, PrefService::UNSYNCABLE_PREF);
+ prefs_.RegisterDictionaryPref(kPref,
+ PrefServiceSyncable::UNSYNCABLE_PREF);
registrar_.Init(&prefs_);
registrar_.Add(kPref, observer_.GetCallback());
}
@@ -28,7 +29,7 @@ class ScopedUserPrefUpdateTest : public testing::Test {
static const char kKey[];
static const char kValue[];
- TestingPrefService prefs_;
+ TestingPrefServiceSyncable prefs_;
MockPrefChangeCallback observer_;
PrefChangeRegistrar registrar_;
};
« no previous file with comments | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/browser/prefs/session_startup_pref.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698