summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 08:49:53 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 08:49:53 +0000
commitac4df1ddc2b0d57433217b5d7c017783c480a74f (patch)
tree754e119e66339c21283917c533a5dc46ac819390 /chrome_frame
parenta9da6bc82b7575641174d4f57f89f67a9f260c7a (diff)
downloadchromium_src-ac4df1ddc2b0d57433217b5d7c017783c480a74f.zip
chromium_src-ac4df1ddc2b0d57433217b5d7c017783c480a74f.tar.gz
chromium_src-ac4df1ddc2b0d57433217b5d7c017783c480a74f.tar.bz2
Reland r45028: Factor out reading and writing of preferences into |PrefStore|.
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/1687001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 8f31849..1a2176b 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -35,6 +35,7 @@
#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"
@@ -467,7 +468,7 @@ class PageLoadTest : public testing::Test {
FilePath local_state_path;
chrome::GetChromeFrameUserDataDirectory(&local_state_path);
- PrefService* local_state = new PrefService(local_state_path);
+ PrefService* local_state = new PrefService(new JsonPrefStore(local_state_path));
return local_state;
}