Manually remove all existing occurences of PrefRegistrySyncable::UNSYNCABLE_PREF

Now that we have added PrefRegistry registration functions that do not need to
accept a flags argument, passing PrefRegistrySyncable::UNSYNCABLE_PREF is
redundant and we can remove it altogether.

BUG=476800

Review URL: https://codereview.chromium.org/1092683004

Cr-Commit-Position: refs/heads/master@{#327439}

chrome/browser/extensions/api/copresence/copresence_api.cc

@@ -110,14 +110,10 @@ void CopresenceService::ResetState() {
 
 // static
 void CopresenceService::RegisterProfilePrefs(PrefRegistrySyncable* registry) {
-  registry->RegisterStringPref(
-      prefs::kCopresenceAuthenticatedDeviceId,
-      std::string(),
-      PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kCopresenceAnonymousDeviceId,
-      std::string(),
-      PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kCopresenceAuthenticatedDeviceId,
+                               std::string());
+  registry->RegisterStringPref(prefs::kCopresenceAnonymousDeviceId,
+                               std::string());
 }
 
 // static

chrome/browser/invalidation/profile_invalidation_provider_factory.cc

@@ -141,8 +141,7 @@ void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kInvalidationServiceUseGCMChannel,
-      true,  // if no value in prefs, use GCM channel.
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+      true);  // if no value in prefs, use GCM channel.
   InvalidatorStorage::RegisterProfilePrefs(registry);
 }
 

chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc

@@ -137,8 +137,7 @@ SupervisedUserSyncService::~SupervisedUserSyncService() {
 // static
 void SupervisedUserSyncService::RegisterProfilePrefs(
     PrefRegistrySyncable* registry) {
-  registry->RegisterDictionaryPref(prefs::kSupervisedUsers,
-                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kSupervisedUsers);
 }
 
 // static

components/content_settings/core/browser/content_settings_default_provider.cc

@@ -12,6 +12,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
+#include "base/prefs/pref_registry.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
@@ -122,12 +123,12 @@ void DefaultProvider::RegisterProfilePrefs(
   // after two stable releases.
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     ContentSettingsType type = static_cast<ContentSettingsType>(i);
-    registry->RegisterIntegerPref(
-        GetPrefName(type),
-        GetDefaultValue(type),
-        IsContentSettingsTypeSyncable(type)
-            ? user_prefs::PrefRegistrySyncable::SYNCABLE_PREF
-            : user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+    if (IsContentSettingsTypeSyncable(type)) {
+      registry->RegisterIntegerPref(GetPrefName(type), GetDefaultValue(type),
+          user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+    } else {
+      registry->RegisterIntegerPref(GetPrefName(type), GetDefaultValue(type));
+    }
   }
 
   // Whether the deprecated dictionary preference has already been migrated

components/content_settings/core/browser/content_settings_pref_provider.cc

@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram.h"
+#include "base/prefs/pref_registry.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_split.h"
@@ -120,12 +121,12 @@ void PrefProvider::RegisterProfilePrefs(
                                 false);
 
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
-    registry->RegisterDictionaryPref(
-        kContentSettingsExceptionsPrefs[i],
-        IsContentSettingsTypeSyncable(ContentSettingsType(i))
-            ? user_prefs::PrefRegistrySyncable::SYNCABLE_PREF
-            : user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF
-    );
+    if (IsContentSettingsTypeSyncable(ContentSettingsType(i))) {
+      registry->RegisterDictionaryPref(kContentSettingsExceptionsPrefs[i],
+          user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+    } else {
+      registry->RegisterDictionaryPref(kContentSettingsExceptionsPrefs[i]);
+    }
   }
 }
 

components/pref_registry/pref_registry_syncable.h

@@ -44,9 +44,6 @@ class PREF_REGISTRY_EXPORT PrefRegistrySyncable : public PrefRegistrySimple {
   //
   // Note: These must NOT overlap with PrefRegistry::PrefRegistrationFlags.
   enum PrefRegistrationFlags {
-    // The pref will not be synced.
-    UNSYNCABLE_PREF = PrefRegistry::NO_REGISTRATION_FLAGS,
-
     // The pref will be synced.
     SYNCABLE_PREF = 1 << 1,
 

extensions/browser/extension_prefs.cc

@@ -1898,44 +1898,24 @@ void ExtensionPrefs::RegisterProfilePrefs(
   registry->RegisterDictionaryPref(pref_names::kExtensions);
   registry->RegisterListPref(pref_names::kToolbar,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterIntegerPref(
-      pref_names::kToolbarSize,
-      -1,  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(pref_names::kToolbarSize, -1);
   registry->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
   registry->RegisterListPref(pref_names::kInstallAllowList);
   registry->RegisterListPref(pref_names::kInstallDenyList);
   registry->RegisterDictionaryPref(pref_names::kInstallForceList);
   registry->RegisterListPref(pref_names::kAllowedTypes);
-  registry->RegisterBooleanPref(
-      pref_names::kStorageGarbageCollect,
-      false,  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterInt64Pref(
-      pref_names::kLastUpdateCheck,
-      0,  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterInt64Pref(
-      pref_names::kNextUpdateCheck,
-      0,  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(pref_names::kStorageGarbageCollect, false);
+  registry->RegisterInt64Pref(pref_names::kLastUpdateCheck, 0);
+  registry->RegisterInt64Pref(pref_names::kNextUpdateCheck, 0);
   registry->RegisterListPref(pref_names::kAllowedInstallSites);
-  registry->RegisterStringPref(
-      pref_names::kLastChromeVersion,
-      std::string(),  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(pref_names::kLastChromeVersion, std::string());
   registry->RegisterDictionaryPref(kInstallSignature);
 
   registry->RegisterListPref(pref_names::kNativeMessagingBlacklist);
   registry->RegisterListPref(pref_names::kNativeMessagingWhitelist);
-  registry->RegisterBooleanPref(
-      pref_names::kNativeMessagingUserLevelHosts,
-      true,  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterIntegerPref(
-      kCorruptedDisableCount,
-      0,  // default value
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(pref_names::kNativeMessagingUserLevelHosts,
+                                true);
+  registry->RegisterIntegerPref(kCorruptedDisableCount, 0);
 
 #if !defined(OS_MACOSX)
   registry->RegisterBooleanPref(pref_names::kAppFullscreenAllowed, true);