[Sync] Don't commit items with predecessors/parents in conflict.

chrome/browser/sync/sessions/session_state.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/session_state.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 172 matching lines @@
   base::JSONWriter::Write(value.get(), true, &json);
   return json;
 }
 
 ConflictProgress::ConflictProgress(bool* dirty_flag) : dirty_(dirty_flag) {}
 
 ConflictProgress::~ConflictProgress() {
   CleanupSets();
 }
 
+bool ConflictProgress::HasSimpleConflictItem(const syncable::Id& id) const {
+  return conflicting_item_ids_.count(id) > 0 &&
+         (IdToConflictSetFind(id) == IdToConflictSetEnd());
+}
+
 IdToConflictSetMap::const_iterator ConflictProgress::IdToConflictSetFind(
     const syncable::Id& the_id) const {
   return id_to_conflict_set_.find(the_id);
 }
 
 IdToConflictSetMap::const_iterator
 ConflictProgress::IdToConflictSetBegin() const {
   return id_to_conflict_set_.begin();
 }
 
@@ skipping 185 matching lines @@
 
 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag)
     : conflict_progress(dirty_flag) {
 }
 
 PerModelSafeGroupState::~PerModelSafeGroupState() {
 }
 
 }  // namespace sessions
 }  // namespace browser_sync