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/test | |
| 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/test')
| -rw-r--r-- | chrome/test/data/pref_service/invalid.json | 1 | ||||
| -rw-r--r-- | chrome/test/reliability/page_load_test.cc | 4 | ||||
| -rw-r--r-- | chrome/test/testing_profile.h | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/chrome/test/data/pref_service/invalid.json b/chrome/test/data/pref_service/invalid.json deleted file mode 100644 index 43392a9..0000000 --- a/chrome/test/data/pref_service/invalid.json +++ /dev/null @@ -1 +0,0 @@ -!@#$%^&
\ No newline at end of file diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index eba821a..fb673b9 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -48,7 +48,6 @@ #include "base/test/test_file_util.h" #include "base/time.h" #include "chrome/app/chrome_version_info.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" @@ -527,8 +526,7 @@ class PageLoadTest : public UITest { FilePath local_state_path = user_data_dir() .Append(chrome::kLocalStateFilename); - PrefService* local_state(new PrefService( - new JsonPrefStore(local_state_path))); + PrefService* local_state(new PrefService(local_state_path)); return local_state; } diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 7c293e9..b4e97d5 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -18,7 +18,6 @@ #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/history/history.h" #include "chrome/browser/in_process_webkit/webkit_context.h" -#include "chrome/browser/json_pref_store.h" #include "chrome/browser/net/url_request_context_getter.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" @@ -147,7 +146,7 @@ class TestingProfile : public Profile { if (!prefs_.get()) { FilePath prefs_filename = path_.Append(FILE_PATH_LITERAL("TestPreferences")); - prefs_.reset(new PrefService(new JsonPrefStore(prefs_filename))); + prefs_.reset(new PrefService(prefs_filename)); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } |