Introduce the plumbing necessary to report Unrecoverable error from model safe workers.

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 344 matching lines @@
       VLOG(2) << "Received a decryptable "
               << syncable::ModelTypeToString(entry->GetServerModelType())
               << " update, applying normally.";
     } else {
       VLOG(2) << "Received an unencrypted "
               << syncable::ModelTypeToString(entry->GetServerModelType())
               << " update, applying normally.";
     }
   }
 
-  SyncerUtil::UpdateLocalDataFromServerData(trans, entry);
+  if (!SyncerUtil::UpdateLocalDataFromServerData(trans, entry))
+    return FAILED_UPDATE;
 
   return SUCCESS;
 }
 
 namespace {
 // Helper to synthesize a new-style sync_pb::EntitySpecifics for use locally,
 // when the server speaks only the old sync_pb::SyncEntity_BookmarkData-based
 // protocol.
 void UpdateBookmarkSpecifics(const std::string& singleton_tag,
                              const std::string& url,
@@ skipping 171 matching lines @@
   CopyServerFields(entry, &new_entry);
   ClearServerData(entry);
 
   VLOG(1) << "Splitting server information, local entry: " << *entry
           << " server entry: " << new_entry;
 }
 
 // This function is called on an entry when we can update the user-facing data
 // from the server data.
 // static
-void SyncerUtil::UpdateLocalDataFromServerData(
+bool SyncerUtil::UpdateLocalDataFromServerData(
     syncable::WriteTransaction* trans,
     syncable::MutableEntry* entry) {
   DCHECK(!entry->Get(IS_UNSYNCED));
   DCHECK(entry->Get(IS_UNAPPLIED_UPDATE));
 
   VLOG(2) << "Updating entry : " << *entry;
   // Start by setting the properties that determine the model_type.
   entry->Put(SPECIFICS, entry->Get(SERVER_SPECIFICS));
   entry->Put(IS_DIR, entry->Get(SERVER_IS_DIR));
   // This strange dance around the IS_DEL flag avoids problems when setting
   // the name.
   // TODO(chron): Is this still an issue? Unit test this codepath.
   if (entry->Get(SERVER_IS_DEL)) {
     entry->Put(IS_DEL, true);
   } else {
     entry->Put(NON_UNIQUE_NAME, entry->Get(SERVER_NON_UNIQUE_NAME));
     entry->Put(PARENT_ID, entry->Get(SERVER_PARENT_ID));
-    CHECK(entry->Put(IS_DEL, false));
+    if (!entry->Put(IS_DEL, false))
+      return false;
     Id new_predecessor =
         entry->ComputePrevIdFromServerPosition(entry->Get(SERVER_PARENT_ID));
-    CHECK(entry->PutPredecessor(new_predecessor))
-        << " Illegal predecessor after converting from server position.";
+    if (!entry->PutPredecessor(new_predecessor))
+      return false;
   }
 
   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);
+
+  return true;
 }
 
 // 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;
@@ skipping 229 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