Index: chrome/browser/sync/sessions/sync_session.cc |
diff --git a/chrome/browser/sync/sessions/sync_session.cc b/chrome/browser/sync/sessions/sync_session.cc |
index b0b53b4cde81a17476b517322edcdf97fbfda84f..47ca7b1ff034896482f2a9af69ec53aa609a3d9b 100644 |
--- a/chrome/browser/sync/sessions/sync_session.cc |
+++ b/chrome/browser/sync/sessions/sync_session.cc |
@@ -189,7 +189,6 @@ bool SyncSession::HasMoreToSync() const { |
const StatusController* status = status_controller_.get(); |
return ((status->commit_ids().size() < status->unsynced_handles().size()) && |
status->syncer_status().num_successful_commits > 0) || |
- status->conflict_sets_built() || |
status->conflicts_resolved(); |
// Or, we have conflicting updates, but we're making progress on |
// resolving them... |