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/metrics | |
| 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/metrics')
| -rw-r--r-- | chrome/browser/metrics/metrics_service_uitest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc index 05c1b8d..6f8b6a3 100644 --- a/chrome/browser/metrics/metrics_service_uitest.cc +++ b/chrome/browser/metrics/metrics_service_uitest.cc @@ -13,6 +13,7 @@ #include "base/platform_thread.h" #include "chrome/browser/chrome_thread.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/json_pref_store.h" @@ -53,10 +54,12 @@ class MetricsServiceTest : public UITest { FilePath local_state_path = user_data_dir() .Append(chrome::kLocalStateFilename); - return new PrefService( + return new PrefService(new PrefValueStore( + NULL, new JsonPrefStore( local_state_path, - ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE))); + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)), + NULL)); } }; |