sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/status_controller.h

 // 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.
 
 // StatusController handles all counter and status related number crunching and
 // state tracking on behalf of a SyncSession.  It 'controls' the model data
 // defined in session_state.h.  The most important feature of StatusController
 // is the ScopedModelSafetyRestriction. When one of these is active, the
 // underlying data set exposed via accessors is swapped out to the appropriate
 // set for the restricted ModelSafeGroup behind the scenes.  For example, if
@@ skipping 129 matching lines @@
   // Control parameters for sync cycles.
   bool conflicts_resolved() const {
     return shared_.control_params.conflicts_resolved;
   }
   bool did_commit_items() const {
     return shared_.control_params.items_committed;
   }
 
   // If a GetUpdates for any data type resulted in downloading an update that
   // is in conflict, this method returns true.
-  // Note: this includes non-blocking conflicts.
+  // Note: this includes unresolvable conflicts.
   bool HasConflictingUpdates() const;
 
-  // Aggregate sum of ConflictingItemSize() over all ConflictProgress objects
-  // (one for each ModelSafeGroup currently in-use).
-  // Note: this does not include non-blocking conflicts.
-  int TotalNumBlockingConflictingItems() const;
+  // Aggregate sum of SimpleConflictingItemSize() over all ConflictProgress
+  // objects (one for each ModelSafeGroup currently in-use).
+  // Note: this does not include unresolvable conflicts.
+  int TotalNumSimpleConflictingItems() const;
 
-  // Aggregate sum of ConflictingItemSize() and NonblockingConflictingItemsSize
-  // over all ConflictProgress objects (one for each ModelSafeGroup currently
-  // in-use).
+  // Aggregate sum of SimpleConflictingItemSize() and other
+  // ${Type}ConflictingItemSize() methods over all ConflictProgress objects (one
+  // for each ModelSafeGroup currently in-use).
   int TotalNumConflictingItems() const;
 
   // Returns the number of updates received from the sync server.
   int64 CountUpdates() const;
 
   // Returns true iff any of the commit ids added during this session are
   // bookmark related, and the bookmark group restriction is in effect.
   bool HasBookmarkCommitActivity() const {
     return ActiveGroupRestrictionIncludesModel(syncable::BOOKMARKS) &&
         shared_.commit_set.HasBookmarkCommitId();
@@ skipping 122 matching lines @@
   }
  private:
   StatusController* status_;
   DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
 };
 
 }
 }
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_STATUS_CONTROLLER_H_