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

chrome/browser/sync/engine/syncer_util.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/syncer_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 525 matching lines @@
   }
 
   entry->Put(CTIME, entry->Get(SERVER_CTIME));
   entry->Put(MTIME, entry->Get(SERVER_MTIME));
   entry->Put(BASE_VERSION, entry->Get(SERVER_VERSION));
   entry->Put(IS_DEL, entry->Get(SERVER_IS_DEL));
   entry->Put(IS_UNAPPLIED_UPDATE, false);
 }
 
 // static
-VerifyCommitResult SyncerUtil::ValidateCommitEntry(
-    syncable::Entry* entry) {
-  syncable::Id id = entry->Get(ID);
-  if (id == entry->Get(PARENT_ID)) {
-    CHECK(id.IsRoot()) << "Non-root item is self parenting." << *entry;
-    // If the root becomes unsynced it can cause us problems.
-    LOG(ERROR) << "Root item became unsynced " << *entry;
-    return VERIFY_UNSYNCABLE;
-  }
-  if (entry->IsRoot()) {
-    LOG(ERROR) << "Permanent item became unsynced " << *entry;
-    return VERIFY_UNSYNCABLE;
-  }
-  if (entry->Get(IS_DEL) && !entry->Get(ID).ServerKnows()) {
-    // Drop deleted uncommitted entries.
-    return VERIFY_UNSYNCABLE;
-  }
-  return VERIFY_OK;
-}
-
-// static
 bool SyncerUtil::AddItemThenPredecessors(
     syncable::BaseTransaction* trans,
     syncable::Entry* item,
     syncable::IndexedBitField inclusion_filter,
     syncable::MetahandleSet* inserted_items,
     std::vector<syncable::Id>* commit_ids) {
 
   if (!inserted_items->insert(item->Get(META_HANDLE)).second)
     return false;
   commit_ids->push_back(item->Get(ID));
@@ skipping 194 matching lines @@
   if (update.version() < target->Get(SERVER_VERSION)) {
     LOG(WARNING) << "Update older than current server version for "
                  << *target << " Update:"
                  << SyncerProtoUtil::SyncEntityDebugString(update);
     return VERIFY_SUCCESS;  // Expected in new sync protocol.
   }
   return VERIFY_UNDECIDED;
 }
 
 }  // namespace browser_sync