Revert 288464 "[Sync] Cleanup datatype configuration error handl..."

trunk/src/components/sync_driver/data_type_manager_impl.h

Index: trunk/src/components/sync_driver/data_type_manager_impl.h
===================================================================
--- trunk/src/components/sync_driver/data_type_manager_impl.h	(revision 289114)
+++ trunk/src/components/sync_driver/data_type_manager_impl.h	(working copy)
@@ -68,9 +68,7 @@
       const syncer::DataTypeAssociationStats& association_stats) OVERRIDE;
   virtual void OnModelAssociationDone(
       const DataTypeManager::ConfigureResult& result) OVERRIDE;
-  virtual void OnSingleDataTypeWillStop(
-      syncer::ModelType type,
-      const syncer::SyncError& error) OVERRIDE;
+  virtual void OnSingleDataTypeWillStop(syncer::ModelType type) OVERRIDE;
 
   // Used by unit tests. TODO(sync) : This would go away if we made
   // this class be able to do Dependency injection. crbug.com/129212.
@@ -82,7 +80,8 @@
   friend class TestDataTypeManager;
 
   // Abort configuration and stop all data types due to configuration errors.
-  void Abort(ConfigureStatus status);
+  void Abort(ConfigureStatus status,
+             const syncer::SyncError& error);
 
   // Returns the priority types (control + priority user types).
   // Virtual for overriding during tests.