Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF

chrome/browser/search_engines/template_url_service_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
@@ skipping 63 matching lines @@
     content::BrowserContext* profile) const {
   return BuildInstanceFor(static_cast<Profile*>(profile));
 }
 
 void TemplateURLServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   DefaultSearchManager::RegisterProfilePrefs(registry);
   registry->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID,
                                std::string(),
                                user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterBooleanPref(
-      prefs::kDefaultSearchProviderEnabled,
-      true,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kDefaultSearchProviderEnabled, true);
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderName,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderID, std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderPrepopulateID,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderSuggestURL,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderSearchURL,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderInstantURL,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderImageURL,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderNewTabURL,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderSearchURLPostParams,
+                               std::string());
   registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderName,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+      prefs::kDefaultSearchProviderSuggestURLPostParams, std::string());
   registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderID,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+      prefs::kDefaultSearchProviderInstantURLPostParams, std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderImageURLPostParams,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderKeyword,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderIconURL,
+                               std::string());
+  registry->RegisterStringPref(prefs::kDefaultSearchProviderEncodings,
+                               std::string());
+  registry->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs);
   registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderPrepopulateID,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderSuggestURL,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderSearchURL,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderInstantURL,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderImageURL,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderNewTabURL,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderSearchURLPostParams,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderSuggestURLPostParams,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderInstantURLPostParams,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderImageURLPostParams,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderKeyword,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderIconURL,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderEncodings,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs,
-                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kDefaultSearchProviderSearchTermsReplacementKey,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+      prefs::kDefaultSearchProviderSearchTermsReplacementKey, std::string());
 }
 
 content::BrowserContext* TemplateURLServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }