Revert 289113 "Revert 288557 "[Sync] Use OnSingleDataTypeUnrecov..."

trunk/src/chrome/browser/sync/glue/bookmark_change_processor.cc

Index: trunk/src/chrome/browser/sync/glue/bookmark_change_processor.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/bookmark_change_processor.cc	(revision 289354)
+++ trunk/src/chrome/browser/sync/glue/bookmark_change_processor.cc	(working copy)
@@ -120,8 +120,11 @@
     syncer::WriteNode topmost_sync_node(&trans);
     if (!model_associator_->InitSyncNodeFromChromeId(topmost->id(),
                                                      &topmost_sync_node)) {
-      error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-                                                          std::string());
+      syncer::SyncError error(FROM_HERE,
+                              syncer::SyncError::DATATYPE_ERROR,
+                              "Failed to init sync node from chrome node",
+                              syncer::BOOKMARKS);
+      error_handler()->OnSingleDataTypeUnrecoverableError(error);
       return;
     }
     // Check that |topmost| has been unlinked.
@@ -163,8 +166,11 @@
   syncer::WriteNode topmost_node(trans);
   if (!model_associator_->InitSyncNodeFromChromeId(topmost_node_id,
                                                    &topmost_node)) {
-    error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-                                                        std::string());
+    syncer::SyncError error(FROM_HERE,
+                            syncer::SyncError::DATATYPE_ERROR,
+                            "Failed to init sync node from chrome node",
+                            syncer::BOOKMARKS);
+    error_handler()->OnSingleDataTypeUnrecoverableError(error);
     return;
   }
   const int64 topmost_sync_id = topmost_node.GetId();
@@ -272,8 +278,11 @@
 
   // Actually create the node with the appropriate initial position.
   if (!PlaceSyncNode(CREATE, parent, index, trans, &sync_child, associator)) {
-    error_handler->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-        "Sync node creation failed; recovery unlikely");
+    syncer::SyncError error(FROM_HERE,
+                            syncer::SyncError::DATATYPE_ERROR,
+                            "Failed ot creat sync node.",
+                            syncer::BOOKMARKS);
+    error_handler->OnSingleDataTypeUnrecoverableError(error);
     return syncer::kInvalidId;
   }
 
@@ -321,8 +330,11 @@
   // Lookup the sync node that's associated with |node|.
   syncer::WriteNode sync_node(trans);
   if (!associator->InitSyncNodeFromChromeId(node->id(), &sync_node)) {
-    error_handler->OnSingleDatatypeUnrecoverableError(
-        FROM_HERE, "Could not load bookmark node on update.");
+    syncer::SyncError error(FROM_HERE,
+                            syncer::SyncError::DATATYPE_ERROR,
+                            "Failed to init sync node from chrome node",
+                            syncer::BOOKMARKS);
+    error_handler->OnSingleDataTypeUnrecoverableError(error);
     return syncer::kInvalidId;
   }
   UpdateSyncNodeProperties(node, model, &sync_node);
@@ -356,15 +368,21 @@
     // Lookup the sync node that's associated with |child|.
     syncer::WriteNode sync_node(&trans);
     if (!model_associator_->InitSyncNodeFromChromeId(child->id(), &sync_node)) {
-      error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-                                                          std::string());
+      syncer::SyncError error(FROM_HERE,
+                              syncer::SyncError::DATATYPE_ERROR,
+                              "Failed to init sync node from chrome node",
+                              syncer::BOOKMARKS);
+      error_handler()->OnSingleDataTypeUnrecoverableError(error);
       return;
     }
 
     if (!PlaceSyncNode(MOVE, new_parent, new_index, &trans, &sync_node,
                        model_associator_)) {
-      error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-                                                          std::string());
+      syncer::SyncError error(FROM_HERE,
+                              syncer::SyncError::DATATYPE_ERROR,
+                              "Failed to place sync node",
+                              syncer::BOOKMARKS);
+      error_handler()->OnSingleDataTypeUnrecoverableError(error);
       return;
     }
   }
@@ -396,8 +414,11 @@
       syncer::WriteNode sync_child(&trans);
       if (!model_associator_->InitSyncNodeFromChromeId(child->id(),
                                                        &sync_child)) {
-        error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-                                                            std::string());
+        syncer::SyncError error(FROM_HERE,
+                                syncer::SyncError::DATATYPE_ERROR,
+                                "Failed to init sync node from chrome node",
+                                syncer::BOOKMARKS);
+        error_handler()->OnSingleDataTypeUnrecoverableError(error);
         return;
       }
       DCHECK_EQ(sync_child.GetParentId(),
@@ -405,8 +426,11 @@
 
       if (!PlaceSyncNode(MOVE, node, i, &trans, &sync_child,
                          model_associator_)) {
-        error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-                                                            std::string());
+        syncer::SyncError error(FROM_HERE,
+                                syncer::SyncError::DATATYPE_ERROR,
+                                "Failed to place sync node",
+                                syncer::BOOKMARKS);
+        error_handler()->OnSingleDataTypeUnrecoverableError(error);
         return;
       }
     }
@@ -528,8 +552,11 @@
                                          model->other_node()->child_count(),
                                          base::string16());
         if (!foster_parent) {
-          error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-              "Failed to create foster parent.");
+          syncer::SyncError error(FROM_HERE,
+                                  syncer::SyncError::DATATYPE_ERROR,
+                                  "Failed to create foster parent",
+                                  syncer::BOOKMARKS);
+          error_handler()->OnSingleDataTypeUnrecoverableError(error);
           return;
         }
       }
@@ -586,8 +613,11 @@
 
     syncer::ReadNode src(trans);
     if (src.InitByIdLookup(it->id) != syncer::BaseNode::INIT_OK) {
-      error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
-          "ApplyModelChanges was passed a bad ID");
+      syncer::SyncError error(FROM_HERE,
+                              syncer::SyncError::DATATYPE_ERROR,
+                              "Failed to load sync node",
+                              syncer::BOOKMARKS);
+      error_handler()->OnSingleDataTypeUnrecoverableError(error);
       return;
     }