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

trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h

Index: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h
===================================================================
--- trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h	(revision 289354)
+++ trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h	(working copy)
@@ -68,9 +68,8 @@
 
   // DataTypeErrorHandler interface.
   // Note: this is performed on the datatype's thread.
-  virtual void OnSingleDatatypeUnrecoverableError(
-      const tracked_objects::Location& from_here,
-      const std::string& message) OVERRIDE;
+  virtual void OnSingleDataTypeUnrecoverableError(
+      const syncer::SyncError& error) OVERRIDE;
 
   // Callback to receive background association results.
   struct AssociationResult {
@@ -147,8 +146,7 @@
 
   // The actual implementation of Disabling the datatype. This happens
   // on the UI thread.
-  virtual void DisableImpl(const tracked_objects::Location& from_here,
-                           const std::string& message);
+  virtual void DisableImpl(const syncer::SyncError& error);
 
   // Record association time. Called on Datatype's thread.
   virtual void RecordAssociationTime(base::TimeDelta time);