Sync: set BASE_VERSION to entry.version() instead of 0 when changing

chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

 // Copyright (c) 2006-2009 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/build_and_process_conflict_sets_command.h"
 
 #include <string>
 #include <sstream>
 #include <vector>
 
@@ skipping 209 matching lines @@
   return true;
 }
 
 void BuildAndProcessConflictSetsCommand::BuildConflictSets(
     syncable::BaseTransaction* trans,
     ConflictProgress* conflict_progress) {
   conflict_progress->CleanupSets();
   set<syncable::Id>::iterator i = conflict_progress->ConflictingItemsBegin();
   while (i != conflict_progress->ConflictingItemsEnd()) {
     syncable::Entry entry(trans, syncable::GET_BY_ID, *i);
-    CHECK(entry.good());
-    if (!entry.Get(syncable::IS_UNSYNCED) &&
-        !entry.Get(syncable::IS_UNAPPLIED_UPDATE)) {
+    if (!entry.good() ||
+        (!entry.Get(syncable::IS_UNSYNCED) &&
+         !entry.Get(syncable::IS_UNAPPLIED_UPDATE))) {
       // This can happen very rarely. It means we had a simply conflicting item
-      // that randomly committed. We drop the entry as it's no longer
-      // conflicting.
+      // that randomly committed; its ID could have changed during the commit.
+      // We drop the entry as it's no longer conflicting.
       conflict_progress->EraseConflictingItemById(*(i++));
       continue;
     }
     if (entry.ExistsOnClientBecauseNameIsNonEmpty() &&
        (entry.Get(syncable::IS_DEL) || entry.Get(syncable::SERVER_IS_DEL))) {
        // If we're deleted on client or server we can't be in a complex set.
       ++i;
       continue;
     }
     bool new_parent =
@@ skipping 153 matching lines @@
     LocallyDeletedPathChecker checker;
     if (!checker.CausingConflict(parent, *entry))
       return;
     conflict_progress->MergeSets(entry->Get(syncable::ID),
                                  parent.Get(syncable::ID));
     CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker);
   }
 }
 
 }  // namespace browser_sync