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/browser/tab_contents | |
| 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/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_unittest.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index 682aac6..75d75ea 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -5,6 +5,7 @@ #include "app/message_box_flags.h" #include "base/logging.h" #include "chrome/browser/pref_service.h" +#include "chrome/browser/pref_value_store.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" @@ -51,11 +52,14 @@ class TabContentsTestingProfile : public TestingProfile { source_path = source_path.AppendASCII("profiles") .AppendASCII("chrome_prefs").AppendASCII("Preferences"); - prefs_.reset(new PrefService( - new JsonPrefStore( - source_path, - ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)))); - + // Create a preference service that only contains user defined + // preference values. + prefs_.reset(new PrefService(new PrefValueStore( + NULL, /* No managed preference values */ + new JsonPrefStore( /* user defined preference values */ + source_path, + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)), + NULL /* No suggested preference values */))); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } |