Revert 288557 "[Sync] Use OnSingleDataTypeUnrecoverableError for..."

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