| Index: sync/internal_api/public/sessions/sync_session_snapshot.cc
|
| diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
|
| index 4d966deef0371cf936bf30047971057f428240d2..ff1d6e64af18704a8e6b5acb9aeda325aa9137f6 100644
|
| --- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
|
| +++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
|
| @@ -27,8 +27,8 @@ SyncSessionSnapshot::SyncSessionSnapshot()
|
| SyncSessionSnapshot::SyncSessionSnapshot(
|
| const ModelNeutralState& model_neutral_state,
|
| bool is_share_usable,
|
| - syncer::ModelTypeSet initial_sync_ended,
|
| - const syncer::ModelTypePayloadMap& download_progress_markers,
|
| + ModelTypeSet initial_sync_ended,
|
| + const ModelTypePayloadMap& download_progress_markers,
|
| bool more_to_sync,
|
| bool is_silenced,
|
| int num_encryption_conflicts,
|
| @@ -80,9 +80,9 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
|
| static_cast<int>(model_neutral_state_.num_server_changes_remaining));
|
| value->SetBoolean("isShareUsable", is_share_usable_);
|
| value->Set("initialSyncEnded",
|
| - syncer::ModelTypeSetToValue(initial_sync_ended_));
|
| + ModelTypeSetToValue(initial_sync_ended_));
|
| value->Set("downloadProgressMarkers",
|
| - syncer::ModelTypePayloadMapToValue(download_progress_markers_));
|
| + ModelTypePayloadMapToValue(download_progress_markers_));
|
| value->SetBoolean("hasMoreToSync", has_more_to_sync_);
|
| value->SetBoolean("isSilenced", is_silenced_);
|
| // We don't care too much if we lose precision here, also.
|
| @@ -117,12 +117,11 @@ bool SyncSessionSnapshot::is_share_usable() const {
|
| return is_share_usable_;
|
| }
|
|
|
| -syncer::ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
|
| +ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
|
| return initial_sync_ended_;
|
| }
|
|
|
| -syncer::ModelTypePayloadMap
|
| - SyncSessionSnapshot::download_progress_markers() const {
|
| +ModelTypePayloadMap SyncSessionSnapshot::download_progress_markers() const {
|
| return download_progress_markers_;
|
| }
|
|
|
|
|