sync: remove buggy freshness condition in SyncSchedulerImpl add defensive DCHECKs.

sync/sessions/test_util.cc

Index: sync/sessions/test_util.cc
diff --git a/sync/sessions/test_util.cc b/sync/sessions/test_util.cc
index ef734b7a538350b67b762ecf1329c70bede56eab..ab5a4cfb6e92a51a85a246aa7719a32a038dbd64 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -48,11 +48,19 @@ void SimulateSuccess(sessions::SyncSession* session,
   }
   ASSERT_EQ(0U, session->status_controller().num_server_changes_remaining());
   session->SetFinished();
-  if (end == SYNCER_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(SYNCER_OK);
+  switch(end) {
+    case SYNCER_END:
+      session->mutable_status_controller()->set_commit_result(SYNCER_OK);
+      // Fall through.
+    case APPLY_UPDATES:

[Nicolas Zea, 2012/08/20 20:31:58]

Note that in syncer.cc:164, configuration jobs manually set the last_step to
SYNCER_END. I don't think this is necessary.

[tim (not reviewing), 2012/08/27 21:19:38]

SyncSchedulerTest doesn't use the code in syncer.cc, though, it relies on
SetSyncerStepsForPurpose for the canonical definition of start/stop for a config
job. 

As a result the scheduler wasn't resetting wait_interval_ in these tests, and
now (with this patch) that will cause a failure. 

+      DCHECK_EQ(end == APPLY_UPDATES, session->source().updates_source ==
+                sync_pb::GetUpdatesCallerInfo::RECONFIGURATION);
+      session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
+      session->mutable_status_controller()->set_last_download_updates_result(
+          SYNCER_OK);
+      break;
+     default:

[Nicolas Zea, 2012/08/20 20:31:58]

fix indent for these two lines

+       ADD_FAILURE() << "Not a valid END state.";
   }
 }