Remove single direction conflict set code

chrome/browser/sync/sessions/sync_session.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 "chrome/browser/sync/sessions/sync_session.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
@@ skipping 171 matching lines @@
   source_ = SyncSourceInfo(
       sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION,
       source_.types);
   return old_source;
 }
 
 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...
 }
 
 const std::set<ModelSafeGroup>& SyncSession::GetEnabledGroups() const {
   return enabled_groups_;
 }
 
 std::set<ModelSafeGroup> SyncSession::GetEnabledGroupsWithConflicts() const {
@@ skipping 48 matching lines @@
       IsError(status_controller_->error().last_post_commit_result);
   const bool process_commit_response_error =
       IsError(status_controller_->error().last_process_commit_response_result);
   return !download_updates_error
       && !post_commit_error
       && !process_commit_response_error;
 }
 
 }  // namespace sessions
 }  // namespace browser_sync