| Index: components/sync_driver/ui_data_type_controller.cc
|
| diff --git a/components/sync_driver/ui_data_type_controller.cc b/components/sync_driver/ui_data_type_controller.cc
|
| index bf4101fbb8bb38b4c35a0a77a047d5d3549757d7..47f5ac16a10e2461d08b5ed753a68c4628b7c865 100644
|
| --- a/components/sync_driver/ui_data_type_controller.cc
|
| +++ b/components/sync_driver/ui_data_type_controller.cc
|
| @@ -47,7 +47,7 @@ UIDataTypeController::UIDataTypeController(
|
| }
|
|
|
| void UIDataTypeController::SetGenericChangeProcessorFactoryForTest(
|
| - scoped_ptr<GenericChangeProcessorFactory> factory) {
|
| + std::unique_ptr<GenericChangeProcessorFactory> factory) {
|
| DCHECK_EQ(state_, NOT_RUNNING);
|
| processor_factory_ = std::move(factory);
|
| }
|
| @@ -228,9 +228,9 @@ void UIDataTypeController::Associate() {
|
| // Passes a reference to |shared_change_processor_|.
|
| local_merge_result = local_service_->MergeDataAndStartSyncing(
|
| type(), initial_sync_data,
|
| - scoped_ptr<syncer::SyncChangeProcessor>(
|
| + std::unique_ptr<syncer::SyncChangeProcessor>(
|
| new SharedChangeProcessorRef(shared_change_processor_)),
|
| - scoped_ptr<syncer::SyncErrorFactory>(
|
| + std::unique_ptr<syncer::SyncErrorFactory>(
|
| new SharedChangeProcessorRef(shared_change_processor_)));
|
| RecordAssociationTime(base::TimeTicks::Now() - start_time);
|
| if (local_merge_result.error().IsSet()) {
|
|
|