Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(566)

Unified Diff: components/sync/model/fake_model_type_service.cc

Issue 2422253002: [Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead. (Closed)
Patch Set: Fixing compile. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {
« no previous file with comments | « components/sync/model/attachments/attachment_service_proxy_unittest.cc ('k') | components/sync/model/sync_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698