sync: Follow-up to conflict resolution refactor

sync/engine/sync_session_job.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/sync_session_job.h"
 #include "sync/internal_api/public/sessions/model_neutral_state.h"
 
 namespace syncer {
 
 SyncSessionJob::~SyncSessionJob() {}
@@ skipping 32 matching lines @@
   // until the SyncSession returned !HasMoreToSync()?
   // Note: if not, it's possible the scheduler hasn't started with
   // SyncShare yet, it's possible there is still more to sync in the session,
   // and it's also possible the job quit part way through due to a premature
   // exit condition (such as shutdown).
   finished_ = early_exit ? EARLY_EXIT : FINISHED;
 
   if (early_exit)
     return false;
 
-  DCHECK(!session_->HasMoreToSync());
-
   // Did we hit any errors along the way?
   if (sessions::HasSyncerError(
       session_->status_controller().model_neutral_state())) {
     return false;
   }
 
   const sessions::ModelNeutralState& state(
       session_->status_controller().model_neutral_state());
   switch (purpose_) {
     case POLL:
@@ skipping 110 matching lines @@
       return;
     default:
       NOTREACHED();
       *start = SYNCER_END;
       *end = SYNCER_END;
       return;
   }
 }
 
 }  // namespace syncer