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..c874931a7ccdd7787b0c7ff7ee352fdaf39b9a0c 100644
--- a/chrome/browser/sync/sessions/status_controller.cc
+++ b/chrome/browser/sync/sessions/status_controller.cc
@@ -263,14 +263,14 @@ bool StatusController::HasConflictingUpdates() const {
   return false;
 }
 
-int StatusController::TotalNumBlockingConflictingItems() const {
+int StatusController::TotalNumSimpleConflictingItems() const {
   DCHECK(!group_restriction_in_effect_)
-      << "TotalNumBlockingConflictingItems applies to all ModelSafeGroups";
+      << "TotalNumSimpleConflictingItems applies to all ModelSafeGroups";
   std::map<ModelSafeGroup, PerModelSafeGroupState*>::const_iterator it =
       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;
 }