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

components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc

 // Copyright 2014 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.
 
 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 28 matching lines @@
 };
 
 BookmarkExpandedStateTrackerTest::BookmarkExpandedStateTrackerTest() {}
 
 BookmarkExpandedStateTrackerTest::~BookmarkExpandedStateTrackerTest() {}
 
 void BookmarkExpandedStateTrackerTest::SetUp() {
   prefs_.registry()->RegisterListPref(prefs::kBookmarkEditorExpandedNodes,
                                       new base::ListValue);
   prefs_.registry()->RegisterListPref(prefs::kManagedBookmarks);
-  model_.reset(new BookmarkModel(base::WrapUnique(new TestBookmarkClient())));
+  model_.reset(new BookmarkModel(base::MakeUnique<TestBookmarkClient>()));
   model_->Load(&prefs_, base::FilePath(),
                base::ThreadTaskRunnerHandle::Get(),
                base::ThreadTaskRunnerHandle::Get());
   test::WaitForBookmarkModelToLoad(model_.get());
 }
 
 void BookmarkExpandedStateTrackerTest::TearDown() {
   model_.reset();
   base::RunLoop().RunUntilIdle();
 }
@@ skipping 35 matching lines @@
   tracker->SetExpandedNodes(nodes);
   // Verify that the node is present.
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
   // Call remove all.
   model_->RemoveAllUserBookmarks();
   // Verify node is not present.
   EXPECT_TRUE(tracker->GetExpandedNodes().empty());
 }
 
 }  // namespace bookmarks