Re-write many calls to WrapUnique() with MakeUnique()

components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 419 matching lines @@
     node.SetTitle(title);
     node.SetBookmarkSpecifics(specifics);
 
     return node.GetId();
   }
 
   // Create a BookmarkModel. If |delete_bookmarks| is true, the bookmarks file
   // 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())
         ->SetExtraNodesToLoad(
             managed_bookmark_service_->GetLoadExtraNodesCallback().Run(
                 &next_id));
     if (delete_bookmarks) {
       base::DeleteFile(data_path.Append(FILE_PATH_LITERAL("dummy_bookmarks")),
                        false);
     }
@@ skipping 328 matching lines @@
 
   syncer::TestUserShare* test_user_share() { return &test_user_share_; }
 
   BookmarkChangeProcessor* change_processor() {
     return change_processor_.get();
   }
 
   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() {
     return &mock_error_handler_;
   }
 
   void delete_model_associator() { model_associator_.reset(); }
 
   BookmarkModelAssociator* model_associator() {
     return model_associator_.get();
@@ skipping 1783 matching lines @@
   EXPECT_EQ(syncer::kInvalidId, sync_id);
 
   // Verify that Sync ignores deleting this node.
   model()->Remove(node);
   EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount());
 }
 
 }  // namespace
 
 }  // namespace browser_sync