Convert PrefSyncStatus into PrefRegistrationFlags

chrome/browser/prefs/pref_service_syncable.cc

Index: chrome/browser/prefs/pref_service_syncable.cc
diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc
index 0a8613c84e2954faffe09f2d30ba404dcd2a8836..cdfc81c749f3b349cf2f406e832578fe6386bfc3 100644
--- a/chrome/browser/prefs/pref_service_syncable.cc
+++ b/chrome/browser/prefs/pref_service_syncable.cc
@@ -55,14 +55,8 @@ PrefServiceSyncable::PrefServiceSyncable(
                  base::Unretained(this)));
 
   // Add already-registered syncable preferences to PrefModelAssociator.
-  const user_prefs::PrefRegistrySyncable::PrefToStatus& syncable_preferences =
-      pref_registry->syncable_preferences();
-  for (user_prefs::PrefRegistrySyncable::PrefToStatus::const_iterator it =
-           syncable_preferences.begin();
-       it != syncable_preferences.end();
-       ++it) {
-    AddRegisteredSyncablePreference(it->first.c_str(), it->second);
-  }
+  for (const auto& entry : pref_registry->registration_flags())
+    AddRegisteredSyncablePreference(entry.first.c_str(), entry.second);
 
   // Watch for syncable preferences registered after this point.
   pref_registry->SetSyncableRegistrationCallback(
@@ -162,17 +156,16 @@ void PrefServiceSyncable::RemoveSyncedPrefObserver(
   priority_pref_sync_associator_.RemoveSyncedPrefObserver(name, observer);
 }
 
-void PrefServiceSyncable::AddRegisteredSyncablePreference(
-    const char* path,
-    const user_prefs::PrefRegistrySyncable::PrefSyncStatus sync_status) {
+void PrefServiceSyncable::AddRegisteredSyncablePreference(const char* path,
+                                                          uint32 flags) {
   DCHECK(FindPreference(path));
-  if (sync_status == user_prefs::PrefRegistrySyncable::SYNCABLE_PREF) {
+  if (flags & user_prefs::PrefRegistrySyncable::SYNCABLE_PREF) {
     pref_sync_associator_.RegisterPref(path);
-  } else if (sync_status ==
+  } else if (flags &
              user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF) {
     priority_pref_sync_associator_.RegisterPref(path);
   } else {
-    NOTREACHED() << "invalid sync_status: " << sync_status;
+    NOTREACHED() << "invalid sync flag";

[Mattias Nissler (ping if slow), 2015/04/20 09:33:34]

This is no longer appropriate after your code change in lines 58-59, as this may
now get invoked for prefs that are not marked as syncable.

[raymes, 2015/04/21 07:58:54]

Ahh good catch, done.

   }
 }