diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 15:01:35 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 15:01:35 +0000 |
| commit | ea587b01337fd38626923e48258a2b39a631543a (patch) | |
| tree | 944b56193e7870f97877836e490556b0983f5b0a /chrome/browser/tab_contents | |
| parent | 893934384f65e8676d226396c34625880a46436a (diff) | |
| download | chromium_src-ea587b01337fd38626923e48258a2b39a631543a.zip chromium_src-ea587b01337fd38626923e48258a2b39a631543a.tar.gz chromium_src-ea587b01337fd38626923e48258a2b39a631543a.tar.bz2 | |
Removed dependency on ChromeThread from JsonPrefStore and moved JsonPrefStore and PrefStore to chrome/common. This is because JsonPrefStore is needed in the service process
BUG=None.
TEST=Updated unit-tests
Review URL: http://codereview.chromium.org/2066015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_unittest.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index f9e731e..e479cd3 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -51,7 +51,11 @@ class TabContentsTestingProfile : public TestingProfile { source_path = source_path.AppendASCII("profiles") .AppendASCII("chrome_prefs").AppendASCII("Preferences"); - prefs_.reset(new PrefService(new JsonPrefStore(source_path))); + prefs_.reset(new PrefService( + new JsonPrefStore( + source_path, + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)))); + Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } |