sync: Remove the remaining conflict sets code

chrome/browser/sync/engine/update_applicator.cc

 // Copyright (c) 2011 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/engine/update_applicator.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
@@ skipping 61 matching lines @@
       application_results_.AddSuccess(entry.Get(syncable::ID));
       break;
     case CONFLICT:
       pointer_++;
       application_results_.AddConflict(entry.Get(syncable::ID));
       break;
     case CONFLICT_ENCRYPTION:
       pointer_++;
       application_results_.AddEncryptionConflict(entry.Get(syncable::ID));
       break;
+    case HIERARCHY_CONFLICT:
+      pointer_++;
+      application_results_.AddHierarchyConflict(entry.Get(syncable::ID));
+      break;
     default:
       NOTREACHED();
       break;
   }
   DVLOG(1) << "Apply Status for " << entry.Get(syncable::META_HANDLE)
            << " is " << updateResponse;
 
   return true;
 }
 
@@ skipping 42 matching lines @@
 }
 
 void UpdateApplicator::ResultTracker::AddConflict(syncable::Id id) {
   conflicting_ids_.push_back(id);
 }
 
 void UpdateApplicator::ResultTracker::AddEncryptionConflict(syncable::Id id) {
   encryption_conflict_ids_.push_back(id);
 }
 
+void UpdateApplicator::ResultTracker::AddHierarchyConflict(syncable::Id id) {
+  hierarchy_conflict_ids_.push_back(id);
+}
+
 void UpdateApplicator::ResultTracker::AddSuccess(syncable::Id id) {
   successful_ids_.push_back(id);
 }
 
 void UpdateApplicator::ResultTracker::SaveProgress(
     sessions::ConflictProgress* conflict_progress,
     sessions::UpdateProgress* update_progress) {
   vector<syncable::Id>::const_iterator i;
   for (i = conflicting_ids_.begin(); i != conflicting_ids_.end(); ++i) {
     conflict_progress->AddConflictingItemById(*i);
     update_progress->AddAppliedUpdate(CONFLICT, *i);
   }
   for (i = encryption_conflict_ids_.begin();
        i != encryption_conflict_ids_.end(); ++i) {
     // Encryption conflicts should not put the syncer into a stuck state. We
     // mark as conflict, so that we reattempt to apply updates, but add it to
     // the list of nonblocking conflicts instead of normal conflicts.
     conflict_progress->AddNonblockingConflictingItemById(*i);
     update_progress->AddAppliedUpdate(CONFLICT, *i);
   }
+  for (i = hierarchy_conflict_ids_.begin();
+       i != hierarchy_conflict_ids_.end(); ++i) {
+    // There's nothing we can do locally to make progress on these conflicts.
+    // We add them to the list of non-blocking conflicts, along with the
+    // encryption conflicts.
+    conflict_progress->AddHierarchyConflictingItemById(*i);
+    update_progress->AddAppliedUpdate(CONFLICT, *i);
+  }
   for (i = successful_ids_.begin(); i != successful_ids_.end(); ++i) {
     conflict_progress->EraseConflictingItemById(*i);
     update_progress->AddAppliedUpdate(SUCCESS, *i);
   }
 }
 
 void UpdateApplicator::ResultTracker::ClearConflicts() {
   conflicting_ids_.clear();
   encryption_conflict_ids_.clear();
+  hierarchy_conflict_ids_.clear();
 }
 
 bool UpdateApplicator::ResultTracker::no_conflicts() const {
   return conflicting_ids_.empty();
 }
 
 }  // namespace browser_sync