Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1661)

Unified Diff: chrome/browser/extensions/component_loader_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/component_loader_unittest.cc
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 2bce8576b109265c0b0169ef438c0bc2a7dcb9b3..d2b2ca02fb19bf2b56671a5345be62fae2789060 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -75,7 +75,7 @@ class ComponentLoaderTest : public testing::Test {
ComponentLoaderTest() :
// Note: we pass the same pref service here, to stand in for both
// user prefs and local state.
- component_loader_(&extension_service_, &prefs_, &prefs_) {
+ component_loader_(&extension_service_, &prefs_, &local_state_) {
}
void SetUp() {
@@ -91,18 +91,23 @@ class ComponentLoaderTest : public testing::Test {
&manifest_contents_));
// Register the user prefs that ComponentLoader will read.
- prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreURL, std::string());
- prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreName, std::string());
+ prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreURL,
+ std::string(),
+ PrefServiceSyncable::UNSYNCABLE_PREF);
+ prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreName,
+ std::string(),
+ PrefServiceSyncable::UNSYNCABLE_PREF);
// Register the local state prefs.
#if defined(OS_CHROMEOS)
- prefs_.RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
+ local_state_.RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
#endif
}
protected:
MockExtensionService extension_service_;
- TestingPrefService prefs_;
+ TestingPrefServiceSyncable prefs_;
+ TestingPrefServiceSimple local_state_;
ComponentLoader component_loader_;
// The root directory of the text extension.

Powered by Google App Engine
This is Rietveld 408576698