Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF

chrome/browser/signin/signin_manager_factory.cc

Index: chrome/browser/signin/signin_manager_factory.cc
diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
index 922264526076be67fc5b9defb3b40f35126cbb92..9b5406fefd9c712e359a081405dd66f693c7a47b 100644
--- a/chrome/browser/signin/signin_manager_factory.cc
+++ b/chrome/browser/signin/signin_manager_factory.cc
@@ -81,53 +81,29 @@ SigninManagerFactory* SigninManagerFactory::GetInstance() {
 
 void SigninManagerFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesHostedDomain,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesLastUsername,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kGoogleServicesHostedDomain,
+                               std::string());
+  registry->RegisterStringPref(prefs::kGoogleServicesLastUsername,
+                               std::string());
   registry->RegisterInt64Pref(
       prefs::kGoogleServicesRefreshTokenAnnotateScheduledTime,
-      base::Time().ToInternalValue(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesSigninScopedDeviceId,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesAccountId,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesUserAccountId,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(
-      prefs::kAutologinEnabled,
-      true,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(
-      prefs::kReverseAutologinEnabled,
-      true,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+      base::Time().ToInternalValue());
+  registry->RegisterStringPref(prefs::kGoogleServicesSigninScopedDeviceId,
+                               std::string());
+  registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string());
+  registry->RegisterStringPref(prefs::kGoogleServicesUserAccountId,
+                               std::string());
+  registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
+  registry->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true);
   registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
-                             new base::ListValue,
-                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterInt64Pref(
-      prefs::kSignedInTime,
-      base::Time().ToInternalValue(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+                             new base::ListValue);
+  registry->RegisterInt64Pref(prefs::kSignedInTime,
+                              base::Time().ToInternalValue());
 
   LocalAuth::RegisterLocalAuthPrefs(registry);
 
   // Deprecated prefs: will be removed in a future release.
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesUsername,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kGoogleServicesUsername, std::string());
 }
 
 // static