diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 16:48:49 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 16:48:49 +0000 |
| commit | db198b2722f4592f6b76294f6a7f9c868e05bc15 (patch) | |
| tree | ce5c93732e2d202548b6e2d69ab6a80cc06ca7ea /chrome/test | |
| parent | ef40c4da832d2082dffe1262b0e2dbf64b5e8031 (diff) | |
| download | chromium_src-db198b2722f4592f6b76294f6a7f9c868e05bc15.zip chromium_src-db198b2722f4592f6b76294f6a7f9c868e05bc15.tar.gz chromium_src-db198b2722f4592f6b76294f6a7f9c868e05bc15.tar.bz2 | |
Add an ExtensionPrefStore, layered between the user prefs and the managed prefs, to manage preferences set by extensions.
Update various callers of the PrefValueStore constructor accordingly.
The initial user will be the proxy extension API.
BUG=266
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/2823037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/reliability/page_load_test.cc | 8 | ||||
| -rw-r--r-- | chrome/test/testing_profile.h | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index eca9df2..e39d342 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -530,12 +530,8 @@ class PageLoadTest : public UITest { FilePath local_state_path = user_data_dir() .Append(chrome::kLocalStateFilename); - 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 advised preference values */))); + PrefService* local_state = PrefService::CreateUserPrefService( + local_state_path); return local_state; } diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index c810a53..67f85a2 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -154,12 +154,7 @@ class TestingProfile : public Profile { FilePath prefs_filename = path_.Append(FILE_PATH_LITERAL("TestPreferences")); - 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 */))); + prefs_.reset(PrefService::CreateUserPrefService(prefs_filename)); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } |