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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 months 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 9c1b3e59795019cb1f13c2c40813c2246dfec193..bda4b2eb6dea520918a46de71025d21240b02316 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -10,6 +10,7 @@
#include "base/path_service.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/prefs/pref_registry_simple.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_set.h"
@@ -92,12 +93,14 @@ class ComponentLoaderTest : public testing::Test {
&manifest_contents_));
// Register the user prefs that ComponentLoader will read.
- prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreURL,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs_.RegisterStringPref(prefs::kEnterpriseWebStoreName,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ prefs_.registry()->RegisterStringPref(
+ prefs::kEnterpriseWebStoreURL,
+ std::string(),
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+ prefs_.registry()->RegisterStringPref(
+ prefs::kEnterpriseWebStoreName,
+ std::string(),
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
// Register the local state prefs.
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698