diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 15:29:58 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 15:29:58 +0000 |
| commit | 43d1eca41085dcebb8b015cf75a2e9a679674438 (patch) | |
| tree | ed61ec0761c10f34a8a442c80077be94b900ccaf /chrome/browser/dom_ui | |
| parent | 9c42a481ed4ef654568785145e143cb172f3e935 (diff) | |
| download | chromium_src-43d1eca41085dcebb8b015cf75a2e9a679674438.zip chromium_src-43d1eca41085dcebb8b015cf75a2e9a679674438.tar.gz chromium_src-43d1eca41085dcebb8b015cf75a2e9a679674438.tar.bz2 | |
Revert 45028 - 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/1523023
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/1682001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui_uitest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/shown_sections_handler_unittest.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc index d130b4e..0b8f380 100644 --- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc +++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc @@ -7,7 +7,6 @@ #include "base/file_path.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/dom_ui/new_tab_ui.h" -#include "chrome/browser/json_pref_store.h" #include "chrome/browser/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/automation/browser_proxy.h" @@ -71,7 +70,7 @@ TEST_F(NewTabUITest, ChromeInternalLoadsNTP) { } TEST_F(NewTabUITest, UpdateUserPrefsVersion) { - PrefService prefs(new JsonPrefStore(FilePath())); + PrefService prefs((FilePath())); // Does the migration NewTabUI::RegisterUserPrefs(&prefs); diff --git a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc b/chrome/browser/dom_ui/shown_sections_handler_unittest.cc index a7fb895..64cbba6 100644 --- a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc +++ b/chrome/browser/dom_ui/shown_sections_handler_unittest.cc @@ -6,7 +6,6 @@ #include "base/file_path.h" #include "base/scoped_ptr.h" -#include "chrome/browser/json_pref_store.h" #include "chrome/browser/pref_service.h" #include "chrome/common/pref_names.h" #include "testing/gtest/include/gtest/gtest.h" @@ -15,7 +14,7 @@ class ShownSectionsHandlerTest : public testing::Test { }; TEST_F(ShownSectionsHandlerTest, MigrateUserPrefs) { - PrefService pref(new JsonPrefStore(FilePath())); + PrefService pref((FilePath())); // Set an *old* value pref.RegisterIntegerPref(prefs::kNTPShownSections, 0); |