Abort sync cycles when download step fails

sync/engine/apply_updates_command.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/apply_updates_command.h"
 
 #include "base/location.h"
 #include "sync/engine/update_applicator.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/syncable.h"
@@ skipping 54 matching lines @@
       handles.begin(), handles.end(), session->routing_info(),
       session->status_controller().group_restriction());
   while (applicator.AttemptOneApplication(&trans)) {}
   applicator.SaveProgressIntoSessionState(
       session->mutable_status_controller()->mutable_conflict_progress(),
       session->mutable_status_controller()->mutable_update_progress());
 
   // This might be the first time we've fully completed a sync cycle, for
   // some subset of the currently synced datatypes.
   const sessions::StatusController& status(session->status_controller());
-  if (status.ServerSaysNothingMoreToDownload()) {
+  if (status.error().last_download_updates_result == SYNCER_OK
+      && status.updates_response().get_updates().changes_remaining() == 0) {
     for (syncable::ModelTypeSet::Iterator it =
              status.updates_request_types().First(); it.Good(); it.Inc()) {
       // This gets persisted to the directory's backing store.
       dir->set_initial_sync_ended_for_type(it.Get(), true);
     }
   }
 
   return SYNCER_OK;
 }
 
 }  // namespace browser_sync