summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/reliability
diff options
context:
space:
mode:
authorpam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 16:48:49 +0000
committerpam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 16:48:49 +0000
commitdb198b2722f4592f6b76294f6a7f9c868e05bc15 (patch)
treece5c93732e2d202548b6e2d69ab6a80cc06ca7ea /chrome_frame/test/reliability
parentef40c4da832d2082dffe1262b0e2dbf64b5e8031 (diff)
downloadchromium_src-db198b2722f4592f6b76294f6a7f9c868e05bc15.zip
chromium_src-db198b2722f4592f6b76294f6a7f9c868e05bc15.tar.gz
chromium_src-db198b2722f4592f6b76294f6a7f9c868e05bc15.tar.bz2
Add an ExtensionPrefStore, layered between the user prefs and the managed prefs, to manage preferences set by extensions.
Update various callers of the PrefValueStore constructor accordingly. The initial user will be the proxy extension API. BUG=266 TEST=covered by unit tests Review URL: http://codereview.chromium.org/2823037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/reliability')
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index badbcd3..d0f8767 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -470,12 +470,8 @@ class PageLoadTest : public testing::Test {
FilePath local_state_path;
chrome::GetChromeFrameUserDataDirectory(&local_state_path);
- PrefService* local_state = new PrefService(new PrefValueStore(
- NULL, /* no managed preference values */
- new JsonPrefStore(/* user defined preference values */
- local_state_path,
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)),
- NULL /* no sugessted preference values */));
+ PrefService* local_state = PrefService::CreateUserPrefService(
+ local_state_path);
return local_state;
}