sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/status_controller.cc

Index: chrome/browser/sync/sessions/status_controller.cc
diff --git a/chrome/browser/sync/sessions/status_controller.cc b/chrome/browser/sync/sessions/status_controller.cc
index 95c8c4f64c68db93dc6fdf51a8a0bc3832bfa77b..e19d70679e0a4890eaf6ac30c9d37f40e0be06eb 100644
--- a/chrome/browser/sync/sessions/status_controller.cc
+++ b/chrome/browser/sync/sessions/status_controller.cc
@@ -270,7 +270,7 @@ int StatusController::TotalNumBlockingConflictingItems() const {
       per_model_group_.begin();
   int sum = 0;
   for (; it != per_model_group_.end(); ++it) {
-    sum += it->second->conflict_progress.ConflictingItemsSize();
+    sum += it->second->conflict_progress.SimpleConflictingItemsSize();
   }
   return sum;
 }
@@ -282,8 +282,10 @@ int StatusController::TotalNumConflictingItems() const {
     per_model_group_.begin();
   int sum = 0;
   for (; it != per_model_group_.end(); ++it) {
-    sum += it->second->conflict_progress.ConflictingItemsSize();
-    sum += it->second->conflict_progress.NonblockingConflictingItemsSize();
+    sum += it->second->conflict_progress.SimpleConflictingItemsSize();
+    sum += it->second->conflict_progress.EncryptionConflictingItemsSize();
+    sum += it->second->conflict_progress.HierarchyConflictingItemsSize();
+    sum += it->second->conflict_progress.ServerConflictingItemsSize();
   }
   return sum;
 }