sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/status_controller.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/status_controller.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/protocol/sync_protocol_error.h"
@@ skipping 215 matching lines @@
       << "HasConflictingUpdates applies to all ModelSafeGroups";
   std::map<ModelSafeGroup, PerModelSafeGroupState*>::const_iterator it =
     per_model_group_.begin();
   for (; it != per_model_group_.end(); ++it) {
     if (it->second->update_progress.HasConflictingUpdates())
       return true;
   }
   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;
 }
 
 int StatusController::TotalNumConflictingItems() const {
   DCHECK(!group_restriction_in_effect_)
       << "TotalNumConflictingItems 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.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;
 }
 
 bool StatusController::ServerSaysNothingMoreToDownload() const {
   if (!download_updates_succeeded())
     return false;
 
   if (!updates_response().get_updates().has_changes_remaining()) {
     NOTREACHED();  // Server should always send changes remaining.
     return false;  // Avoid looping forever.
   }
   // Changes remaining is an estimate, but if it's estimated to be
   // zero, that's firm and we don't have to ask again.
   return updates_response().get_updates().changes_remaining() == 0;
 }
 
 void StatusController::set_debug_info_sent() {
   shared_.control_params.debug_info_sent = true;
 }
 
 bool StatusController::debug_info_sent() const {
   return shared_.control_params.debug_info_sent;
 }
 
 }  // namespace sessions
 }  // namespace browser_sync