| Index: components/sync/model/fake_model_type_service.cc
|
| diff --git a/components/sync/model/fake_model_type_service.cc b/components/sync/model/fake_model_type_service.cc
|
| index 6eb0b56451a6040ecc3f77893fc5472027634d98..78d60263729915c7787364568147fb7ddf269436 100644
|
| --- a/components/sync/model/fake_model_type_service.cc
|
| +++ b/components/sync/model/fake_model_type_service.cc
|
| @@ -307,7 +307,8 @@ ConflictResolution FakeModelTypeService::ResolveConflict(
|
|
|
| void FakeModelTypeService::SetConflictResolution(
|
| ConflictResolution resolution) {
|
| - conflict_resolution_.reset(new ConflictResolution(std::move(resolution)));
|
| + conflict_resolution_ =
|
| + base::MakeUnique<ConflictResolution>(std::move(resolution));
|
| }
|
|
|
| void FakeModelTypeService::SetServiceError(SyncError::ErrorType error_type) {
|
|
|