diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 13:13:28 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 13:13:28 +0000 |
| commit | d8b08c98289cc59828a9f9bef0de16252ef9da18 (patch) | |
| tree | 2cadb8879a5923827f98810c4ca87f31a4d4ef25 /chrome_frame | |
| parent | ffcaeac917f846d978c5d5b216ccb06def6d22be (diff) | |
| download | chromium_src-d8b08c98289cc59828a9f9bef0de16252ef9da18.zip chromium_src-d8b08c98289cc59828a9f9bef0de16252ef9da18.tar.gz chromium_src-d8b08c98289cc59828a9f9bef0de16252ef9da18.tar.bz2 | |
Support multiple PrefStores
Add interface for multi_pref_store_manager.
BUG=40259
TEST=Unittests in pref_service_unittest.cc, pref_value_store_unittest.cc
Review URL: http://codereview.chromium.org/1957005
Patch from Markus Heintz <markusheintz@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 70a6ee4..badbcd3 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -38,6 +38,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/pref_service.h" +#include "chrome/browser/pref_value_store.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" @@ -469,10 +470,12 @@ class PageLoadTest : public testing::Test { FilePath local_state_path; chrome::GetChromeFrameUserDataDirectory(&local_state_path); - PrefService* local_state = new PrefService( - new JsonPrefStore( - local_state_path, - ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE))); + 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 */)); return local_state; } |