sync: Remove the remaining conflict sets 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 142 matching lines @@
   return SyncSessionSnapshot(
       status_controller_->syncer_status(),
       status_controller_->error(),
       status_controller_->num_server_changes_remaining(),
       is_share_useable,
       initial_sync_ended,
       download_progress_markers,
       HasMoreToSync(),
       delegate_->IsSyncingCurrentlySilenced(),
       status_controller_->unsynced_handles().size(),
-      status_controller_->TotalNumBlockingConflictingItems(),
+      status_controller_->TotalNumSimpleConflictingItems(),
       status_controller_->TotalNumConflictingItems(),
       status_controller_->did_commit_items(),
       source_,
       dir->GetEntriesCount(),
       status_controller_->sync_start_time(),
       !Succeeded());
 }
 
 void SyncSession::SendEventNotification(SyncEngineEvent::EventCause cause) {
   SyncEngineEvent event(cause);
@@ skipping 26 matching lines @@
 }
 
 std::set<ModelSafeGroup> SyncSession::GetEnabledGroupsWithConflicts() const {
   const std::set<ModelSafeGroup>& enabled_groups = GetEnabledGroups();
   std::set<ModelSafeGroup> enabled_groups_with_conflicts;
   for (std::set<ModelSafeGroup>::const_iterator it =
            enabled_groups.begin(); it != enabled_groups.end(); ++it) {
     const sessions::ConflictProgress* conflict_progress =
         status_controller_->GetUnrestrictedConflictProgress(*it);
     if (conflict_progress &&
-        (conflict_progress->ConflictingItemsBegin() !=
-         conflict_progress->ConflictingItemsEnd())) {
+        (conflict_progress->SimpleConflictingItemsBegin() !=
+         conflict_progress->SimpleConflictingItemsEnd())) {
       enabled_groups_with_conflicts.insert(*it);
     }
   }
   return enabled_groups_with_conflicts;
 }
 
 std::set<ModelSafeGroup>
     SyncSession::GetEnabledGroupsWithVerifiedUpdates() const {
   const std::set<ModelSafeGroup>& enabled_groups = GetEnabledGroups();
   std::set<ModelSafeGroup> enabled_groups_with_verified_updates;
@@ skipping 29 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