Revert 164565 - sync: make scheduling logic and job ownership more obvious.

sync/sessions/test_util.cc

Index: sync/sessions/test_util.cc
===================================================================
--- sync/sessions/test_util.cc	(revision 164641)
+++ sync/sessions/test_util.cc	(working copy)
@@ -31,9 +31,6 @@
 
 void SimulateCommitFailed(sessions::SyncSession* session,
                           SyncerStep begin, SyncerStep end) {
-  session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
-  session->mutable_status_controller()->set_last_download_updates_result(
-      SYNCER_OK);
   session->mutable_status_controller()->set_commit_result(
       SERVER_RETURN_TRANSIENT_ERROR);
 }
@@ -50,6 +47,7 @@
     ADD_FAILURE() << "Shouldn't have more to sync";
   }
   ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
+  session->SetFinished();
   switch(end) {
     case SYNCER_END:
       session->mutable_status_controller()->set_commit_result(SYNCER_OK);
@@ -68,20 +66,16 @@
 
 void SimulateThrottledImpl(sessions::SyncSession* session,
     const base::TimeDelta& delta) {
-  session->mutable_status_controller()->set_last_download_updates_result(
-      SERVER_RETURN_THROTTLED);
   session->delegate()->OnSilencedUntil(base::TimeTicks::Now() + delta);
 }
 
 void SimulatePollIntervalUpdateImpl(sessions::SyncSession* session,
     const base::TimeDelta& new_poll) {
-  SimulateSuccess(session, SYNCER_BEGIN, SYNCER_END);
   session->delegate()->OnReceivedLongPollIntervalUpdate(new_poll);
 }
 
 void SimulateSessionsCommitDelayUpdateImpl(sessions::SyncSession* session,
     const base::TimeDelta& new_delay) {
-  SimulateSuccess(session, SYNCER_BEGIN, SYNCER_END);
   session->delegate()->OnReceivedSessionsCommitDelay(new_delay);
 }