| Index: components/sync/driver/data_type_controller.cc
|
| diff --git a/components/sync_driver/data_type_controller.cc b/components/sync/driver/data_type_controller.cc
|
| similarity index 83%
|
| rename from components/sync_driver/data_type_controller.cc
|
| rename to components/sync/driver/data_type_controller.cc
|
| index f1a138d7579b65432ed4d45eadf5fa28d87f19d9..b15e8c321e32d664f0d52943efeb020a4a93d1c5 100644
|
| --- a/components/sync_driver/data_type_controller.cc
|
| +++ b/components/sync/driver/data_type_controller.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/sync_driver/data_type_controller.h"
|
| +#include "components/sync/driver/data_type_controller.h"
|
|
|
| #include "components/sync/base/data_type_histogram.h"
|
| #include "components/sync/base/model_type.h"
|
| @@ -17,8 +17,7 @@ DataTypeController::DataTypeController(
|
| error_callback_(error_callback),
|
| ui_thread_(ui_thread) {}
|
|
|
| -DataTypeController::~DataTypeController() {
|
| -}
|
| +DataTypeController::~DataTypeController() {}
|
|
|
| bool DataTypeController::IsUnrecoverableResult(ConfigureResult result) {
|
| return (result == UNRECOVERABLE_ERROR);
|
| @@ -34,9 +33,7 @@ syncer::SyncError DataTypeController::CreateAndUploadError(
|
| syncer::ModelType type) {
|
| if (!error_callback_.is_null())
|
| error_callback_.Run();
|
| - return syncer::SyncError(location,
|
| - syncer::SyncError::DATATYPE_ERROR,
|
| - message,
|
| + return syncer::SyncError(location, syncer::SyncError::DATATYPE_ERROR, message,
|
| type);
|
| }
|
|
|
|
|