| Index: chrome/browser/sync/sessions/test_util.cc
|
| diff --git a/chrome/browser/sync/sessions/test_util.cc b/chrome/browser/sync/sessions/test_util.cc
|
| index 7c0eca938a1b98b708a09517cbd2f62059802633..dd6724d089caa3293646fcecaafaba3f7fed97b3 100644
|
| --- a/chrome/browser/sync/sessions/test_util.cc
|
| +++ b/chrome/browser/sync/sessions/test_util.cc
|
| @@ -16,21 +16,14 @@ void SimulateHasMoreToSync(sessions::SyncSession* session,
|
|
|
| void SimulateDownloadUpdatesFailed(sessions::SyncSession* session,
|
| SyncerStep begin, SyncerStep end) {
|
| - // Note that a non-zero value of changes_remaining once a session has
|
| - // completed implies that the Syncer was unable to exhaust this count during
|
| - // the GetUpdates cycle. This is an indication that an error occurred.
|
| - session->mutable_status_controller()->set_num_server_changes_remaining(1);
|
| + session->mutable_status_controller()->set_download_updates_result(
|
| + SERVER_RETURN_TRANSIENT_ERROR);
|
| }
|
|
|
| void SimulateCommitFailed(sessions::SyncSession* session,
|
| SyncerStep begin, SyncerStep end) {
|
| - // Note that a non-zero number of unsynced handles once a session has
|
| - // completed implies that the Syncer was unable to make forward progress
|
| - // during a commit, indicating an error occurred.
|
| - // See implementation of SyncSession::HasMoreToSync.
|
| - std::vector<int64> handles;
|
| - handles.push_back(1);
|
| - session->mutable_status_controller()->set_unsynced_handles(handles);
|
| + session->mutable_status_controller()->set_post_commit_result(
|
| + SERVER_RETURN_TRANSIENT_ERROR);
|
| }
|
|
|
| void SimulateSuccess(sessions::SyncSession* session,
|
|
|