Making some CHECK statements to NOTREACHED.

chrome/browser/sync/engine/build_and_process_conflict_sets_command.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/build_and_process_conflict_sets_command.h"
 
 #include <set>
 #include <string>
 #include <sstream>
 #include <vector>
@@ skipping 98 matching lines @@
                                backup->ref(syncable::META_HANDLE));
   CHECK(entry.good());
 
   if (!entry.Put(syncable::IS_DEL, backup->ref(syncable::IS_DEL)))
     return false;
 
   entry.Put(syncable::NON_UNIQUE_NAME, backup->ref(syncable::NON_UNIQUE_NAME));
   entry.Put(syncable::PARENT_ID, backup->ref(syncable::PARENT_ID));
 
   if (!backup->ref(syncable::IS_DEL)) {
-    CHECK(entry.PutPredecessor(backup->ref(syncable::PREV_ID)));
+    if (!entry.PutPredecessor(backup->ref(syncable::PREV_ID)))
+      return false;

[akalin, 2011/10/15 00:21:24]

maybe add NOTREACHED() so that it crashes on debug builds

[lipalani1, 2011/10/15 00:36:31]

Done.

   }
 
   if (backup->ref(syncable::PREV_ID) != entry.Get(syncable::PREV_ID))
     return false;
 
   entry.Put(syncable::CTIME, backup->ref(syncable::CTIME));
   entry.Put(syncable::MTIME, backup->ref(syncable::MTIME));
   entry.Put(syncable::BASE_VERSION, backup->ref(syncable::BASE_VERSION));
   entry.Put(syncable::IS_DIR, backup->ref(syncable::IS_DIR));
   entry.Put(syncable::IS_DEL, backup->ref(syncable::IS_DEL));
@@ skipping 269 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