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

Unified Diff: components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

Issue 2256813005: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/browser/profile_sync_service_bookmark_unittest.cc
diff --git a/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc b/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc
index 6851168646f471ac4f49e6651f5b95648a22187a..59fb1c7e8269504f0437adc4054c343663279e3d 100644
--- a/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc
+++ b/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc
@@ -437,8 +437,8 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
// will be deleted before starting up the BookmarkModel.
std::unique_ptr<BookmarkModel> CreateBookmarkModel(bool delete_bookmarks) {
const base::FilePath& data_path = data_dir_.path();
- auto model = base::WrapUnique(new BookmarkModel(
- base::WrapUnique(new bookmarks::TestBookmarkClient())));
+ auto model = base::MakeUnique<BookmarkModel>(
+ base::WrapUnique(new bookmarks::TestBookmarkClient()));
managed_bookmark_service_->BookmarkModelCreated(model.get());
int64_t next_id = 0;
static_cast<bookmarks::TestBookmarkClient*>(model->client())
@@ -787,8 +787,8 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
void delete_change_processor() { change_processor_.reset(); }
void ResetChangeProcessor() {
- change_processor_ = base::WrapUnique(new BookmarkChangeProcessor(
- sync_client_.get(), model_associator_.get(), &mock_error_handler_));
+ change_processor_ = base::MakeUnique<BookmarkChangeProcessor>(
+ sync_client_.get(), model_associator_.get(), &mock_error_handler_);
}
syncer::DataTypeErrorHandlerMock* mock_error_handler() {

Powered by Google App Engine
This is Rietveld 408576698