[Sync] Use OnSingleDataTypeUnrecoverableError for all errors

components/sync_driver/non_ui_data_type_controller.h

Index: components/sync_driver/non_ui_data_type_controller.h
diff --git a/components/sync_driver/non_ui_data_type_controller.h b/components/sync_driver/non_ui_data_type_controller.h
index 17a0dbe3e2541ff8ddf92868b2e410896681c05a..0f4fdabc9425ef8def323bc8c92b4cd512cc4c94 100644
--- a/components/sync_driver/non_ui_data_type_controller.h
+++ b/components/sync_driver/non_ui_data_type_controller.h
@@ -27,7 +27,6 @@ class NonUIDataTypeController : public DataTypeController {
   NonUIDataTypeController(
       scoped_refptr<base::MessageLoopProxy> ui_thread,
       const base::Closure& error_callback,
-      const DisableTypeCallback& disable_callback,
       SyncApiComponentFactory* sync_factory);
 
   // DataTypeController interface.
@@ -40,9 +39,8 @@ class NonUIDataTypeController : public DataTypeController {
   virtual ChangeProcessor* GetChangeProcessor() const OVERRIDE;
   virtual std::string name() const OVERRIDE;
   virtual State state() const OVERRIDE;
-  virtual void OnSingleDatatypeUnrecoverableError(
-      const tracked_objects::Location& from_here,
-      const std::string& message) OVERRIDE;
+  virtual void OnSingleDataTypeUnrecoverableError(
+      const syncer::SyncError& error) OVERRIDE;
 
  protected:
   // For testing only.
@@ -125,8 +123,7 @@ class NonUIDataTypeController : public DataTypeController {
   // Disable this type with the sync service. Should only be invoked in case of
   // an unrecoverable error.
   // Note: this is performed on the UI thread.
-  void DisableImpl(const tracked_objects::Location& from_here,
-                   const std::string& message);
+  void DisableImpl(const syncer::SyncError& error);
 
   SyncApiComponentFactory* const sync_factory_;