summaryrefslogtreecommitdiffstats
path: root/chrome/browser/pref_member_unittest.cc
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 13:09:45 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 13:09:45 +0000
commit277404c272c394aae9f7f13f380d603705de3238 (patch)
treeab3359cf9842f4d7e6351557654222f2284039f1 /chrome/browser/pref_member_unittest.cc
parent6d17363cf71ed2f09be55c58b189be36ce087cbc (diff)
downloadchromium_src-277404c272c394aae9f7f13f380d603705de3238.zip
chromium_src-277404c272c394aae9f7f13f380d603705de3238.tar.gz
chromium_src-277404c272c394aae9f7f13f380d603705de3238.tar.bz2
Reland "Factor out reading and writing of preferences into |PrefStore|."
The CL now applies after r45225 (Throw out preferences files that are corrupt rather than keeping them in read-only mode), which means that the changes in that commit moved to JsonPrefStore. I updated JsonPrefStoreTest.InvalidFile to test the new behavior. *** In order to implement platform-specific 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/1717007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pref_member_unittest.cc')
-rw-r--r--chrome/browser/pref_member_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/pref_member_unittest.cc b/chrome/browser/pref_member_unittest.cc
index 96cf68d..4a137e5 100644
--- a/chrome/browser/pref_member_unittest.cc
+++ b/chrome/browser/pref_member_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/file_path.h"
+#include "chrome/browser/dummy_pref_store.h"
#include "chrome/browser/pref_member.h"
#include "chrome/browser/pref_service.h"
#include "chrome/common/notification_service.h"
@@ -51,7 +52,7 @@ class PrefMemberTestClass : public NotificationObserver {
} // anonymous namespace
TEST(PrefMemberTest, BasicGetAndSet) {
- PrefService prefs((FilePath()));
+ PrefService prefs(new DummyPrefStore());
RegisterTestPrefs(&prefs);
// Test bool
@@ -141,7 +142,7 @@ TEST(PrefMemberTest, BasicGetAndSet) {
TEST(PrefMemberTest, TwoPrefs) {
// Make sure two RealPrefMembers stay in sync.
- PrefService prefs((FilePath()));
+ PrefService prefs(new DummyPrefStore());
RegisterTestPrefs(&prefs);
RealPrefMember pref1;
@@ -161,7 +162,7 @@ TEST(PrefMemberTest, TwoPrefs) {
}
TEST(PrefMemberTest, Observer) {
- PrefService prefs((FilePath()));
+ PrefService prefs(new DummyPrefStore());
RegisterTestPrefs(&prefs);
PrefMemberTestClass test_obj(&prefs);