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

Unified Diff: components/browser_sync/profile_sync_service_bookmark_unittest.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/browser_sync/profile_sync_service_bookmark_unittest.cc
diff --git a/components/browser_sync/profile_sync_service_bookmark_unittest.cc b/components/browser_sync/profile_sync_service_bookmark_unittest.cc
index 56ed06803fecdd1d4fc21b3b00e1520d0d8c268f..42a709c59dc4bf2dba5eb7ca8b7070daf180bcb0 100644
--- a/components/browser_sync/profile_sync_service_bookmark_unittest.cc
+++ b/components/browser_sync/profile_sync_service_bookmark_unittest.cc
@@ -546,10 +546,10 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
DCHECK(!model_associator_);
// Set up model associator.
- model_associator_.reset(new BookmarkModelAssociator(
+ model_associator_ = base::MakeUnique<BookmarkModelAssociator>(
model_.get(), sync_client_.get(), test_user_share_.user_share(),
base::MakeUnique<syncer::DataTypeErrorHandlerMock>(),
- kExpectMobileBookmarks));
+ kExpectMobileBookmarks);
local_merge_result_ = syncer::SyncMergeResult(syncer::BOOKMARKS);
syncer_merge_result_ = syncer::SyncMergeResult(syncer::BOOKMARKS);

Powered by Google App Engine
This is Rietveld 408576698