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

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

 // Copyright 2012 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/glue/bookmark_model_associator.h"
 
 #include <stack>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 712 matching lines @@
   std::vector<const BookmarkNode*> bnodes;
   {
     syncer::WriteTransaction trans(FROM_HERE, user_share_, &new_version);
     DirtyAssociationsSyncIds::iterator iter;
     for (iter = dirty_associations_sync_ids_.begin();
          iter != dirty_associations_sync_ids_.end();
          ++iter) {
       int64 sync_id = *iter;
       syncer::WriteNode sync_node(&trans);
       if (sync_node.InitByIdLookup(sync_id) != syncer::BaseNode::INIT_OK) {
-        unrecoverable_error_handler_->OnSingleDatatypeUnrecoverableError(
+        syncer::SyncError error(
             FROM_HERE,
-            "Could not lookup bookmark node for ID persistence.");
+            syncer::SyncError::DATATYPE_ERROR,
+            "Could not lookup bookmark node for ID persistence.",
+            syncer::BOOKMARKS);
+        unrecoverable_error_handler_->OnSingleDataTypeUnrecoverableError(error);
         return;
       }
       const BookmarkNode* node = GetChromeNodeFromSyncId(sync_id);
       if (node && sync_node.GetExternalId() != node->id()) {
         sync_node.SetExternalId(node->id());
         bnodes.push_back(node);
       }
     }
     dirty_associations_sync_ids_.clear();
   }
@@ skipping 45 matching lines @@
                                  syncer::SyncError::PERSISTENCE_ERROR,
                                  message,
                                  syncer::BOOKMARKS);
       }
     }
   }
   return syncer::SyncError();
 }
 
 }  // namespace browser_sync