| Index: chrome/browser/sync/syncable/model_type_payload_map.cc
|
| diff --git a/chrome/browser/sync/syncable/model_type_payload_map.cc b/chrome/browser/sync/syncable/model_type_payload_map.cc
|
| index 737dd21f9639ad527f340aa7dd5864315398a45a..7c73ba9e3eb64e689e1107f699b5e5b76f29b2da 100644
|
| --- a/chrome/browser/sync/syncable/model_type_payload_map.cc
|
| +++ b/chrome/browser/sync/syncable/model_type_payload_map.cc
|
| @@ -14,19 +14,19 @@ using browser_sync::ModelSafeRoutingInfo;
|
| namespace syncable {
|
|
|
| ModelTypePayloadMap ModelTypePayloadMapFromEnumSet(
|
| - syncable::ModelEnumSet types,
|
| + syncable::ModelTypeSet types,
|
| const std::string& payload) {
|
| ModelTypePayloadMap types_with_payloads;
|
| - for (syncable::ModelEnumSet::Iterator it = types.First();
|
| + for (syncable::ModelTypeSet::Iterator it = types.First();
|
| it.Good(); it.Inc()) {
|
| types_with_payloads[it.Get()] = payload;
|
| }
|
| return types_with_payloads;
|
| }
|
|
|
| -ModelEnumSet ModelTypePayloadMapToEnumSet(
|
| +ModelTypeSet ModelTypePayloadMapToEnumSet(
|
| const ModelTypePayloadMap& payload_map) {
|
| - ModelEnumSet types;
|
| + ModelTypeSet types;
|
| for (ModelTypePayloadMap::const_iterator it = payload_map.begin();
|
| it != payload_map.end(); ++it) {
|
| types.Put(it->first);
|
|
|