From ea587b01337fd38626923e48258a2b39a631543a Mon Sep 17 00:00:00 2001 From: "sanjeevr@chromium.org" Date: Fri, 21 May 2010 15:01:35 +0000 Subject: 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 --- chrome/test/testing_profile.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'chrome/test/testing_profile.h') diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 43c713c..70e3085 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -12,6 +12,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/chrome_thread.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/find_bar_state.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" @@ -19,10 +20,10 @@ #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/history/history.h" #include "chrome/browser/in_process_webkit/webkit_context.h" -#include "chrome/browser/json_pref_store.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/common/json_pref_store.h" #include "chrome/common/net/url_request_context_getter.h" #include "net/base/cookie_monster.h" @@ -148,7 +149,10 @@ class TestingProfile : public Profile { if (!prefs_.get()) { FilePath prefs_filename = path_.Append(FILE_PATH_LITERAL("TestPreferences")); - prefs_.reset(new PrefService(new JsonPrefStore(prefs_filename))); + prefs_.reset(new PrefService( + new JsonPrefStore( + prefs_filename, + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)))); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } -- cgit v1.1