sync: Remove the remaining conflict sets code

chrome/browser/sync/engine/update_applicator.h

Index: chrome/browser/sync/engine/update_applicator.h
diff --git a/chrome/browser/sync/engine/update_applicator.h b/chrome/browser/sync/engine/update_applicator.h
index 1196fccf29f5128678c2ecbd8415c46d630c1783..8abf9f68825abb6426a83ee98f72312c3e2413d6 100644
--- a/chrome/browser/sync/engine/update_applicator.h
+++ b/chrome/browser/sync/engine/update_applicator.h
@@ -57,14 +57,13 @@ class UpdateApplicator {
 
  private:
   // Track the status of all applications.
-  // We treat encryption conflicts as nonblocking conflict items when we save
-  // progress.
   class ResultTracker {
    public:
      explicit ResultTracker(size_t num_results);
      virtual ~ResultTracker();
-     void AddConflict(syncable::Id);
+     void AddSimpleConflict(syncable::Id);
      void AddEncryptionConflict(syncable::Id);
+     void AddHierarchyConflict(syncable::Id);
      void AddSuccess(syncable::Id);
      void SaveProgress(sessions::ConflictProgress* conflict_progress,
                        sessions::UpdateProgress* update_progress);
@@ -77,6 +76,7 @@ class UpdateApplicator {
     std::vector<syncable::Id> conflicting_ids_;
     std::vector<syncable::Id> successful_ids_;
     std::vector<syncable::Id> encryption_conflict_ids_;
+    std::vector<syncable::Id> hierarchy_conflict_ids_;
   };
 
   // If true, AttemptOneApplication will skip over |entry| and return true.