diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 17:24:44 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 17:24:44 +0000 |
| commit | 5b19952e27008d9cca170c1a517987795d145928 (patch) | |
| tree | 34fea6a6f74a0388c68c4ba8cd8846f3ac879027 /chrome/browser/chromeos/proxy_config_service_impl_unittest.cc | |
| parent | 96828ec57f67f91b3b1b2269963680501a6de4b9 (diff) | |
| download | chromium_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/chromeos/proxy_config_service_impl_unittest.cc')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index e102e04..9040c77 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -235,7 +235,7 @@ class ProxyConfigServiceImplTestBase : public TESTBASE { : ui_thread_(BrowserThread::UI, &loop_), io_thread_(BrowserThread::IO, &loop_) {} - virtual void Init(PrefService* pref_service) { + virtual void Init(PrefServiceSimple* pref_service) { ASSERT_TRUE(pref_service); DBusThreadManager::Initialize(); PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service); @@ -340,7 +340,7 @@ class ProxyConfigServiceImplTest Init(&pref_service_); } - TestingPrefService pref_service_; + TestingPrefServiceSimple pref_service_; }; TEST_F(ProxyConfigServiceImplTest, NetworkProxy) { |