summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 15:01:35 +0000
committersanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 15:01:35 +0000
commitea587b01337fd38626923e48258a2b39a631543a (patch)
tree944b56193e7870f97877836e490556b0983f5b0a /chrome/browser/extensions
parent893934384f65e8676d226396c34625880a46436a (diff)
downloadchromium_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/extensions')
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc7
-rw-r--r--chrome/browser/extensions/test_extension_prefs.cc8
2 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 78264b3..c74b644 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -18,6 +18,7 @@
#include "base/string_util.h"
#include "base/task.h"
#include "base/version.h"
+#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_creator.h"
#include "chrome/browser/extensions/extension_error_reporter.h"
@@ -241,7 +242,11 @@ ExtensionsServiceTestBase::~ExtensionsServiceTestBase() {
void ExtensionsServiceTestBase::InitializeExtensionsService(
const FilePath& pref_file, const FilePath& extensions_install_dir) {
ExtensionTestingProfile* profile = new ExtensionTestingProfile();
- prefs_.reset(new PrefService(new JsonPrefStore(pref_file)));
+ prefs_.reset(new PrefService(
+ new JsonPrefStore(
+ pref_file,
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE))));
+
Profile::RegisterUserPrefs(prefs_.get());
browser::RegisterUserPrefs(prefs_.get());
profile_.reset(profile);
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index e9a1472..716539f 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -9,10 +9,10 @@
#include "base/message_loop.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/json_pref_store.h"
#include "chrome/browser/pref_service.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/json_pref_store.h"
#include "testing/gtest/include/gtest/gtest.h"
TestExtensionPrefs::TestExtensionPrefs() {
@@ -37,7 +37,11 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
file_loop.RunAllPending();
}
- pref_service_.reset(new PrefService(new JsonPrefStore(preferences_file_)));
+ pref_service_.reset(new PrefService(
+ new JsonPrefStore(
+ preferences_file_,
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE))));
+
ExtensionPrefs::RegisterUserPrefs(pref_service_.get());
prefs_.reset(new ExtensionPrefs(pref_service_.get(), temp_dir_.path()));
}