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

trunk/src/components/sync_driver/fake_data_type_controller.cc

Index: trunk/src/components/sync_driver/fake_data_type_controller.cc
===================================================================
--- trunk/src/components/sync_driver/fake_data_type_controller.cc	(revision 289354)
+++ trunk/src/components/sync_driver/fake_data_type_controller.cc	(working copy)
@@ -12,8 +12,7 @@
 namespace sync_driver {
 
 FakeDataTypeController::FakeDataTypeController(ModelType type)
-      : DataTypeController(base::MessageLoopProxy::current(), base::Closure(),
-                           DisableTypeCallback()),
+      : DataTypeController(base::MessageLoopProxy::current(), base::Closure()),
         state_(NOT_RUNNING),
         model_load_delayed_(false),
         type_(type),
@@ -137,11 +136,8 @@
   return state_;
 }
 
-void FakeDataTypeController::OnSingleDatatypeUnrecoverableError(
-    const tracked_objects::Location& from_here,
-    const std::string& message) {
-  syncer::SyncError error(
-      from_here, syncer::SyncError::DATATYPE_ERROR, message, type_);
+void FakeDataTypeController::OnSingleDataTypeUnrecoverableError(
+    const syncer::SyncError& error) {
   syncer::SyncMergeResult local_merge_result(type());
   local_merge_result.set_error(error);
   last_start_callback_.Run(