[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/syncable/model_type_payload_map.h

Index: chrome/browser/sync/syncable/model_type_payload_map.h
diff --git a/chrome/browser/sync/syncable/model_type_payload_map.h b/chrome/browser/sync/syncable/model_type_payload_map.h
index e4b581783591f12131f4d0f80c0c319caa6d0fc7..cdf9ca7e0ca235b8e71db34121223625d510f284 100644
--- a/chrome/browser/sync/syncable/model_type_payload_map.h
+++ b/chrome/browser/sync/syncable/model_type_payload_map.h
@@ -26,13 +26,13 @@ typedef std::map<ModelType, std::string> ModelTypePayloadMap;
 
 // Helper functions for building ModelTypePayloadMaps.
 
-// Make a TypePayloadMap from all the types in a ModelTypeBitSet using
-// a default payload.
-ModelTypePayloadMap ModelTypePayloadMapFromBitSet(
-    const ModelTypeBitSet& model_types,
-    const std::string& payload);
+// Make a TypePayloadMap from all the types in a ModelEnumSet using a
+// default payload.
+ModelTypePayloadMap ModelTypePayloadMapFromEnumSet(
+    ModelEnumSet model_types, const std::string& payload);
 
-ModelTypeSet ModelTypePayloadMapToSet(const ModelTypePayloadMap& payload_map);
+ModelEnumSet ModelTypePayloadMapToEnumSet(
+    const ModelTypePayloadMap& payload_map);
 
 // Make a TypePayloadMap for all the enabled types in a
 // ModelSafeRoutingInfo using a default payload.