diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 13:14:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 13:14:04 +0000 |
| commit | c753f148dc1a10cd9461e50e03dc2a93652c13d1 (patch) | |
| tree | 9e1a8558556a0f31d4e527c4c203d076f8cca920 /chrome/test/base/testing_profile.cc | |
| parent | e6dbde892ddea9e179fa76e4db1333e83776d160 (diff) | |
| download | chromium_src-c753f148dc1a10cd9461e50e03dc2a93652c13d1.zip chromium_src-c753f148dc1a10cd9461e50e03dc2a93652c13d1.tar.gz chromium_src-c753f148dc1a10cd9461e50e03dc2a93652c13d1.tar.bz2 | |
Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.
Minimize usage of PrefServiceSyncable. It is mostly an implementation detail of ProfileImpl and the sync integration.
TBR=ben@chromium.org
BUG=155525
Review URL: https://codereview.chromium.org/12079097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_profile.cc')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index dddb2f5..73fc4d7 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -39,6 +39,7 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/prefs/browser_prefs.h" +#include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/profiles/storage_partition_descriptor.h" @@ -559,11 +560,11 @@ void TestingProfile::CreateTestingPrefService() { DCHECK(!prefs_.get()); testing_prefs_ = new TestingPrefServiceSyncable(); prefs_.reset(testing_prefs_); - Profile::RegisterUserPrefs(prefs_.get()); - chrome::RegisterUserPrefs(prefs_.get()); + Profile::RegisterUserPrefs(testing_prefs_->registry()); + chrome::RegisterUserPrefs(testing_prefs_, testing_prefs_->registry()); } -PrefServiceSyncable* TestingProfile::GetPrefs() { +PrefService* TestingProfile::GetPrefs() { if (!prefs_.get()) { CreateTestingPrefService(); } @@ -769,7 +770,7 @@ GURL TestingProfile::GetHomePage() { return GURL(chrome::kChromeUINewTabURL); } -PrefServiceSyncable* TestingProfile::GetOffTheRecordPrefs() { +PrefService* TestingProfile::GetOffTheRecordPrefs() { return NULL; } |