summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_notifier_impl_unittest.cc
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-22 17:24:44 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-22 17:24:44 +0000
commit5b19952e27008d9cca170c1a517987795d145928 (patch)
tree34fea6a6f74a0388c68c4ba8cd8846f3ac879027 /chrome/browser/prefs/pref_notifier_impl_unittest.cc
parent96828ec57f67f91b3b1b2269963680501a6de4b9 (diff)
downloadchromium_src-5b19952e27008d9cca170c1a517987795d145928.zip
chromium_src-5b19952e27008d9cca170c1a517987795d145928.tar.gz
chromium_src-5b19952e27008d9cca170c1a517987795d145928.tar.bz2
Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.
The first two (PrefServiceSimple is a subclass of PrefService) know nothing about sync or any Chrome or content concepts. The third (PrefServiceSyncable, a separate subclass of PrefService) knows about sync and requires users to choose whether each individual preference is syncable or not when it is registered. BrowserProcess::local_state() is a PrefServiceSimple after this change, and Profile::prefs() is a PrefServiceSyncable. COLLABORATOR=kaiwang@chromium.org TBR=ben@chromium.org BUG=155525 Review URL: https://chromiumcodereview.appspot.com/11570009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_notifier_impl_unittest.cc')
-rw-r--r--chrome/browser/prefs/pref_notifier_impl_unittest.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/prefs/pref_notifier_impl_unittest.cc b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
index 7570aef..3d3057c 100644
--- a/chrome/browser/prefs/pref_notifier_impl_unittest.cc
+++ b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
@@ -94,14 +94,12 @@ class PrefNotifierTest : public testing::Test {
protected:
virtual void SetUp() {
pref_service_.RegisterBooleanPref(kChangedPref,
- true,
- PrefService::UNSYNCABLE_PREF);
+ true);
pref_service_.RegisterBooleanPref(kUnchangedPref,
- true,
- PrefService::UNSYNCABLE_PREF);
+ true);
}
- TestingPrefService pref_service_;
+ TestingPrefServiceSimple pref_service_;
PrefObserverMock obs1_;
PrefObserverMock obs2_;