[Sync] Use OnSingleDataTypeUnrecoverableError for all errors

components/sync_driver/data_type_controller.h

Index: components/sync_driver/data_type_controller.h
diff --git a/components/sync_driver/data_type_controller.h b/components/sync_driver/data_type_controller.h
index 7d8b67cabce2ed87df04cba8933a1e3e19fe3ad1..a673b1f473d1bd044a0ae9a51da2272c0e2d07c1 100644
--- a/components/sync_driver/data_type_controller.h
+++ b/components/sync_driver/data_type_controller.h
@@ -149,8 +149,7 @@ class DataTypeController
   friend class base::DeleteHelper<DataTypeController>;
 
   DataTypeController(scoped_refptr<base::MessageLoopProxy> ui_thread,
-                     const base::Closure& error_callback,
-                     const DisableTypeCallback& disable_callback);
+                     const base::Closure& error_callback);
 
   // If the DTC is waiting for models to load, once the models are
   // loaded the datatype service will call this function on DTC to let
@@ -160,16 +159,12 @@ class DataTypeController
   virtual ~DataTypeController();
 
   syncer::UserShare* user_share() const;
-  DisableTypeCallback disable_callback();
 
   // The callback that will be invoked when an unrecoverable error occurs.
   // TODO(sync): protected for use by legacy controllers.
   base::Closure error_callback_;
 
  private:
-  // TODO(tim): Bug 383480. Do we need two callbacks?
-  DisableTypeCallback disable_callback_;
-
   syncer::UserShare* user_share_;
 };