| Index: chrome/browser/sync/engine/store_timestamps_command.cc
|
| diff --git a/chrome/browser/sync/engine/store_timestamps_command.cc b/chrome/browser/sync/engine/store_timestamps_command.cc
|
| index 345f0391517bb278d36f4a6e31c174cf5f4160bc..140191b4d0e1b727dabf852951253f35d70126e4 100644
|
| --- a/chrome/browser/sync/engine/store_timestamps_command.cc
|
| +++ b/chrome/browser/sync/engine/store_timestamps_command.cc
|
| @@ -32,7 +32,7 @@ void StoreTimestampsCommand::ExecuteImpl(sessions::SyncSession* session) {
|
| // Update the progress marker tokens from the server result. If a marker
|
| // was omitted for any one type, that indicates no change from the previous
|
| // state.
|
| - syncable::ModelEnumSet forward_progress_types;
|
| + syncable::ModelTypeSet forward_progress_types;
|
| for (int i = 0; i < updates.new_progress_marker_size(); ++i) {
|
| syncable::ModelType model =
|
| syncable::GetModelTypeFromExtensionFieldNumber(
|
| @@ -49,9 +49,9 @@ void StoreTimestampsCommand::ExecuteImpl(sessions::SyncSession* session) {
|
| if (VLOG_IS_ON(1)) {
|
| DVLOG_IF(1, !forward_progress_types.Empty())
|
| << "Get Updates got new progress marker for types: "
|
| - << syncable::ModelEnumSetToString(forward_progress_types)
|
| + << syncable::ModelTypeSetToString(forward_progress_types)
|
| << " out of possible: "
|
| - << syncable::ModelEnumSetToString(status->updates_request_types());
|
| + << syncable::ModelTypeSetToString(status->updates_request_types());
|
| }
|
| if (updates.has_changes_remaining()) {
|
| int64 changes_left = updates.changes_remaining();
|
|
|