| Index: chrome/browser/sync/engine/apply_updates_command.cc
|
| diff --git a/chrome/browser/sync/engine/apply_updates_command.cc b/chrome/browser/sync/engine/apply_updates_command.cc
|
| index 2acd63bdcfafd0a2e58f03a716f8a31dc34e3022..c7a14c8f7cc541af752d6f1add9ad7ad10d306d5 100644
|
| --- a/chrome/browser/sync/engine/apply_updates_command.cc
|
| +++ b/chrome/browser/sync/engine/apply_updates_command.cc
|
| @@ -25,7 +25,7 @@ std::set<ModelSafeGroup> ApplyUpdatesCommand::GetGroupsToChange(
|
| const sessions::SyncSession& session) const {
|
| std::set<ModelSafeGroup> groups_with_unapplied_updates;
|
|
|
| - syncable::FullModelEnumSet server_types_with_unapplied_updates;
|
| + syncable::FullModelTypeSet server_types_with_unapplied_updates;
|
| {
|
| syncable::ScopedDirLookup dir(session.context()->directory_manager(),
|
| session.context()->account_name());
|
| @@ -39,7 +39,7 @@ std::set<ModelSafeGroup> ApplyUpdatesCommand::GetGroupsToChange(
|
| dir->GetServerTypesWithUnappliedUpdates(&trans);
|
| }
|
|
|
| - for (syncable::FullModelEnumSet::Iterator it =
|
| + for (syncable::FullModelTypeSet::Iterator it =
|
| server_types_with_unapplied_updates.First(); it.Good(); it.Inc()) {
|
| groups_with_unapplied_updates.insert(
|
| GetGroupForModelType(it.Get(), session.routing_info()));
|
| @@ -60,10 +60,10 @@ void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {
|
|
|
| // Compute server types with unapplied updates that fall under our
|
| // group restriction.
|
| - const syncable::FullModelEnumSet server_types_with_unapplied_updates =
|
| + const syncable::FullModelTypeSet server_types_with_unapplied_updates =
|
| dir->GetServerTypesWithUnappliedUpdates(&trans);
|
| - syncable::FullModelEnumSet server_type_restriction;
|
| - for (syncable::FullModelEnumSet::Iterator it =
|
| + syncable::FullModelTypeSet server_type_restriction;
|
| + for (syncable::FullModelTypeSet::Iterator it =
|
| server_types_with_unapplied_updates.First(); it.Good(); it.Inc()) {
|
| if (GetGroupForModelType(it.Get(), session->routing_info()) ==
|
| session->status_controller().group_restriction()) {
|
| @@ -89,7 +89,7 @@ void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {
|
| // some subset of the currently synced datatypes.
|
| const sessions::StatusController& status(session->status_controller());
|
| if (status.ServerSaysNothingMoreToDownload()) {
|
| - for (syncable::ModelEnumSet::Iterator it =
|
| + for (syncable::ModelTypeSet::Iterator it =
|
| status.updates_request_types().First(); it.Good(); it.Inc()) {
|
| // This gets persisted to the directory's backing store.
|
| dir->set_initial_sync_ended_for_type(it.Get(), true);
|
|
|