| Index: components/sync/api/model_type_service.cc
|
| diff --git a/components/sync/api/model_type_service.cc b/components/sync/api/model_type_service.cc
|
| index 59ed6ff266c8b8a7369b6121ca011a22f2222e20..6efacdb6ff8bc6e7b716602bdd552e6b5d3a01b5 100644
|
| --- a/components/sync/api/model_type_service.cc
|
| +++ b/components/sync/api/model_type_service.cc
|
| @@ -9,11 +9,11 @@
|
| #include "components/sync/api/data_type_error_handler.h"
|
| #include "components/sync/api/model_type_change_processor.h"
|
|
|
| -namespace syncer_v2 {
|
| +namespace syncer {
|
|
|
| ModelTypeService::ModelTypeService(
|
| const ChangeProcessorFactory& change_processor_factory,
|
| - syncer::ModelType type)
|
| + ModelType type)
|
| : change_processor_factory_(change_processor_factory), type_(type) {}
|
|
|
| ModelTypeService::~ModelTypeService() {}
|
| @@ -30,7 +30,7 @@ ConflictResolution ModelTypeService::ResolveConflict(
|
| }
|
|
|
| void ModelTypeService::OnSyncStarting(
|
| - std::unique_ptr<syncer::DataTypeErrorHandler> error_handler,
|
| + std::unique_ptr<DataTypeErrorHandler> error_handler,
|
| const ModelTypeChangeProcessor::StartCallback& start_callback) {
|
| CreateChangeProcessor();
|
| change_processor_->OnSyncStarting(std::move(error_handler), start_callback);
|
| @@ -58,4 +58,4 @@ void ModelTypeService::clear_change_processor() {
|
| change_processor_.reset();
|
| }
|
|
|
| -} // namespace syncer_v2
|
| +} // namespace syncer
|
|
|