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_frame/test/reliability | |
| 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_frame/test/reliability')
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 1a2176b..8f31849 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -35,7 +35,6 @@ #include "base/string_util.h" #include "base/test/test_file_util.h" #include "base/time.h" -#include "chrome/browser/json_pref_store.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/pref_service.h" #include "chrome/common/chrome_constants.h" @@ -468,7 +467,7 @@ class PageLoadTest : public testing::Test { FilePath local_state_path; chrome::GetChromeFrameUserDataDirectory(&local_state_path); - PrefService* local_state = new PrefService(new JsonPrefStore(local_state_path)); + PrefService* local_state = new PrefService(local_state_path); return local_state; } |