diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 11:48:21 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 11:48:21 +0000 |
| commit | 8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8 (patch) | |
| tree | b87113a3ed8f5594daf03d0d5a3134e504dcadd4 /chrome/browser/search_engines | |
| parent | 7c983cc803a9b4a9ada8a43c3091a0bf6be78418 (diff) | |
| download | chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.zip chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.tar.gz chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.tar.bz2 | |
Add a PrefStore for loading prefs from command-line switches.
The first users are proxies and locale, for policies.
BUG=49162
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3025001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc index 003c64b..49248a7 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc @@ -102,11 +102,8 @@ TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) { FilePath preferences_file = temp_dir.path().AppendASCII("Preferences"); file_util::WriteFile(preferences_file, pref_data, sizeof(pref_data)); - scoped_ptr<PrefService> prefs(new PrefService(new PrefValueStore( - NULL, new JsonPrefStore(preferences_file, - ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)), - NULL, NULL))); - + scoped_ptr<PrefService> prefs( + PrefService::CreateUserPrefService(preferences_file)); TemplateURLPrepopulateData::RegisterUserPrefs(prefs.get()); int version = TemplateURLPrepopulateData::GetDataVersion(prefs.get()); |