| Index: sync/internal_api/public/sessions/model_neutral_state.h
|
| diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h
|
| index fa127b04e8f38200cf74266ef5c1a7cfbb9187b9..d9d53ab4782d9d0991c33d40b7065737c41e800e 100644
|
| --- a/sync/internal_api/public/sessions/model_neutral_state.h
|
| +++ b/sync/internal_api/public/sessions/model_neutral_state.h
|
| @@ -24,7 +24,7 @@ struct ModelNeutralState {
|
|
|
| // We GetUpdates for some combination of types at once.
|
| // requested_update_types stores the set of types which were requested.
|
| - syncable::ModelTypeSet updates_request_types;
|
| + syncer::ModelTypeSet updates_request_types;
|
|
|
| sync_pb::ClientToServerResponse updates_response;
|
|
|
| @@ -40,7 +40,7 @@ struct ModelNeutralState {
|
|
|
| // If the syncer encountered a MIGRATION_DONE code, these are the types that
|
| // the client must now "migrate", by purging and re-downloading all updates.
|
| - syncable::ModelTypeSet types_needing_local_migration;
|
| + syncer::ModelTypeSet types_needing_local_migration;
|
|
|
| // Overwrites due to conflict resolution counters.
|
| int num_local_overwrites;
|
|
|