Index: base/prefs/public/pref_member_unittest.cc |
diff --git a/base/prefs/public/pref_member_unittest.cc b/base/prefs/public/pref_member_unittest.cc |
index 4203db3aa3caabe01bb771d9897cf976f472378c..0bc04b25218eb489134606d7249e16974541d9f5 100644 |
--- a/base/prefs/public/pref_member_unittest.cc |
+++ b/base/prefs/public/pref_member_unittest.cc |
@@ -19,16 +19,12 @@ const char kDoublePref[] = "double"; |
const char kStringPref[] = "string"; |
const char kStringListPref[] = "string_list"; |
-void RegisterTestPrefs(PrefService* prefs) { |
- prefs->RegisterBooleanPref(kBoolPref, false, PrefService::UNSYNCABLE_PREF); |
- prefs->RegisterIntegerPref(kIntPref, 0, PrefService::UNSYNCABLE_PREF); |
- prefs->RegisterDoublePref(kDoublePref, 0.0, PrefService::UNSYNCABLE_PREF); |
- prefs->RegisterStringPref(kStringPref, |
- "default", |
- PrefService::UNSYNCABLE_PREF); |
- prefs->RegisterListPref(kStringListPref, |
- new ListValue(), |
- PrefService::UNSYNCABLE_PREF); |
+void RegisterTestPrefs(PrefServiceSimple* prefs) { |
+ prefs->RegisterBooleanPref(kBoolPref, false); |
+ prefs->RegisterIntegerPref(kIntPref, 0); |
+ prefs->RegisterDoublePref(kDoublePref, 0.0); |
+ prefs->RegisterStringPref(kStringPref, "default"); |
+ prefs->RegisterListPref(kStringListPref, new ListValue()); |
} |
class GetPrefValueHelper |
@@ -98,7 +94,7 @@ class PrefMemberTestClass { |
} // anonymous namespace |
TEST(PrefMemberTest, BasicGetAndSet) { |
- TestingPrefService prefs; |
+ TestingPrefServiceSimple prefs; |
RegisterTestPrefs(&prefs); |
// Test bool |
@@ -244,7 +240,7 @@ TEST(PrefMemberTest, InvalidList) { |
TEST(PrefMemberTest, TwoPrefs) { |
// Make sure two DoublePrefMembers stay in sync. |
- TestingPrefService prefs; |
+ TestingPrefServiceSimple prefs; |
RegisterTestPrefs(&prefs); |
DoublePrefMember pref1; |
@@ -264,7 +260,7 @@ TEST(PrefMemberTest, TwoPrefs) { |
} |
TEST(PrefMemberTest, Observer) { |
- TestingPrefService prefs; |
+ TestingPrefServiceSimple prefs; |
RegisterTestPrefs(&prefs); |
PrefMemberTestClass test_obj(&prefs); |
@@ -296,7 +292,7 @@ TEST(PrefMemberTest, NoInit) { |
} |
TEST(PrefMemberTest, MoveToThread) { |
- TestingPrefService prefs; |
+ TestingPrefServiceSimple prefs; |
scoped_refptr<GetPrefValueHelper> helper(new GetPrefValueHelper()); |
RegisterTestPrefs(&prefs); |
helper->Init(kBoolPref, &prefs); |