diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 17:24:42 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 17:24:42 +0000 |
| commit | 7aa0a96ae010300281e897ac9b8111683fb5672c (patch) | |
| tree | cf929138214dccfad36951a96a4e86f20e17136a /chrome/browser/profile.cc | |
| parent | 807c01ae2f590bc809312e9be809baa6ac38d5c7 (diff) | |
| download | chromium_src-7aa0a96ae010300281e897ac9b8111683fb5672c.zip chromium_src-7aa0a96ae010300281e897ac9b8111683fb5672c.tar.gz chromium_src-7aa0a96ae010300281e897ac9b8111683fb5672c.tar.bz2 | |
Revert 45168 - Reland r45028: Factor out reading and writing of preferences into |PrefStore|.
In order to implement platformspecific policies, reading and writing preferences needs to be abstracted from the |PrefService|. The interface for that is now |PrefStore|, with an implementation |JsonPrefStore|, which stores the pref data in a JSON file. There is another implementation, |DummyPrefStore|, which doesn't store any persistent preferences, and is currently used for tests.
Most of the changes are for using the new interface, which is |new PrefService(new JsonPrefStore(filename))| instead of |new PrefService(filename)|.
BUG=40259
TEST=PrefServiceTest.*:PrefServiceSetValueTest.*:PrefMemberTest.*:JsonPrefStoreTest.*
Review URL: http://codereview.chromium.org/1687001
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/1688004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 11d2120..92b2ff8 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -37,7 +37,6 @@ #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/in_process_webkit/webkit_context.h" -#include "chrome/browser/json_pref_store.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -939,7 +938,7 @@ net::TransportSecurityState* PrefService* ProfileImpl::GetPrefs() { if (!prefs_.get()) { - prefs_.reset(new PrefService(new JsonPrefStore(GetPrefFilePath()))); + prefs_.reset(new PrefService(GetPrefFilePath())); // The Profile class and ProfileManager class may read some prefs so // register known prefs as soon as possible. |