sync: Remove the remaining conflict sets code

chrome/browser/sync/internal_api/debug_info_event_listener.cc

Index: chrome/browser/sync/internal_api/debug_info_event_listener.cc
diff --git a/chrome/browser/sync/internal_api/debug_info_event_listener.cc b/chrome/browser/sync/internal_api/debug_info_event_listener.cc
index d783deea2af512863963ffb6a4a1b62204027142..8c49eb59bbe36f16891bd1041a7d990bf8c86b16 100644
--- a/chrome/browser/sync/internal_api/debug_info_event_listener.cc
+++ b/chrome/browser/sync/internal_api/debug_info_event_listener.cc
@@ -23,10 +23,11 @@ void DebugInfoEventListener::OnSyncCycleCompleted(
   sync_pb::SyncCycleCompletedEventInfo* sync_completed_event_info =
       event_info.mutable_sync_cycle_completed_event_info();
 
+  // TODO(rlarocque): These counters are reversed.  We should fix this bug.
   sync_completed_event_info->set_num_blocking_conflicts(
       snapshot->num_conflicting_updates);
   sync_completed_event_info->set_num_non_blocking_conflicts(
-      snapshot->num_blocking_conflicting_updates);
+      snapshot->num_simple_conflicting_updates);
 
   AddEventToQueue(event_info);
 }