[Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead.

components/browser_sync/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 528 matching lines @@
       node.SetExternalId(0);
       last_child_id = node.GetId();
     }
     return true;
   }
 
   bool AssociateModels() {
     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);
     int local_count_before = model_->root_node()->GetTotalNodeCount();
     int syncer_count_before = GetSyncBookmarkCount();
 
     syncer::SyncError error = model_associator_->AssociateModels(
         &local_merge_result_, &syncer_merge_result_);
     if (error.IsSet())
       return false;
@@ skipping 2029 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