Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

chrome/browser/extensions/test_extension_prefs.cc

Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index fe016fc2433360163e44ebbe02b9c4d257215452..d95e03c9304263df401ec9a668e02653cf8cc9b1 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -93,7 +93,7 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
   builder.WithUserFilePrefs(preferences_file_, task_runner_);
   builder.WithExtensionPrefs(
       new ExtensionPrefStore(extension_pref_value_map_.get(), false));
-  pref_service_.reset(builder.Create());
+  pref_service_.reset(builder.CreateSyncable());
   ExtensionPrefs::RegisterUserPrefs(pref_service_.get());
 
   prefs_ = ExtensionPrefs::Create(
@@ -156,7 +156,7 @@ std::string TestExtensionPrefs::AddExtensionAndReturnId(std::string name) {
   return extension->id();
 }
 
-PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {
+PrefServiceSyncable* TestExtensionPrefs::CreateIncognitoPrefService() const {
   return pref_service_->CreateIncognitoPrefService(
       new ExtensionPrefStore(extension_pref_value_map_.get(), true));
 }