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/test/testing_profile.h | |
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/test/testing_profile.h')
-rw-r--r-- | chrome/test/testing_profile.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 70e3085..dac0025 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -21,6 +21,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/in_process_webkit/webkit_context.h" #include "chrome/browser/pref_service.h" +#include "chrome/browser/pref_value_store.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/json_pref_store.h" @@ -149,10 +150,13 @@ class TestingProfile : public Profile { if (!prefs_.get()) { FilePath prefs_filename = path_.Append(FILE_PATH_LITERAL("TestPreferences")); - prefs_.reset(new PrefService( - new JsonPrefStore( - prefs_filename, - ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)))); + + prefs_.reset(new PrefService(new PrefValueStore( + NULL, /* no managed preference values */ + new JsonPrefStore( /* user defined preference values */ + prefs_filename, + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)), + NULL /* no suggested preference values */))); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } |