| Index: components/sync_driver/fake_data_type_controller.cc
|
| diff --git a/components/sync_driver/fake_data_type_controller.cc b/components/sync_driver/fake_data_type_controller.cc
|
| index 5ba1c4cbdd1f47db80ab8563fa7340a87a15ee79..897e77aa471327cf3964e9edb4e8c38897b3651e 100644
|
| --- a/components/sync_driver/fake_data_type_controller.cc
|
| +++ b/components/sync_driver/fake_data_type_controller.cc
|
| @@ -12,8 +12,7 @@ using syncer::ModelType;
|
| 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 @@ DataTypeController::State FakeDataTypeController::state() const {
|
| 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(
|
|
|