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

chrome/browser/profiles/profile_statistics_unittest.cc

 // Copyright 2015 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 "chrome/browser/profiles/profile_statistics.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 17 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 std::unique_ptr<KeyedService> BuildBookmarkModelWithoutLoad(
     content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
   std::unique_ptr<bookmarks::BookmarkModel> bookmark_model(
-      new bookmarks::BookmarkModel(base::WrapUnique(new ChromeBookmarkClient(
-          profile, ManagedBookmarkServiceFactory::GetForProfile(profile)))));
+      new bookmarks::BookmarkModel(base::MakeUnique<ChromeBookmarkClient>(
+          profile, ManagedBookmarkServiceFactory::GetForProfile(profile))));
   return std::move(bookmark_model);
 }
 
 void LoadBookmarkModel(Profile* profile,
                        bookmarks::BookmarkModel* bookmark_model) {
   bookmark_model->Load(profile->GetPrefs(), profile->GetPath(),
                        profile->GetIOTaskRunner(),
                        content::BrowserThread::GetTaskRunnerForThread(
                            content::BrowserThread::UI));
 }
@@ skipping 126 matching lines @@
   run_loop2.RunUntilIdle();
   EXPECT_EQ(0, bookmark_stat_helper.GetNumOfTimesCalled());
 
   // Load the bookmark model. When the model is loaded (asynchronously), the
   // observer added by WaitOrCountBookmarks is run.
   LoadBookmarkModel(profile, bookmark_model);
 
   run_loop_aggregator_destruction.Run();
   EXPECT_EQ(1, bookmark_stat_helper.GetNumOfTimesCalled());
 }