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

ios/chrome/browser/browser_state/test_chrome_browser_state.mm

 // Copyright 2013 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 "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
@@ skipping 34 matching lines @@
 #include "ios/chrome/browser/sync/glue/sync_start_util.h"
 #include "ios/chrome/browser/web_data_service_factory.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/web/public/web_thread.h"
 #include "net/url_request/url_request_test_util.h"
 
 namespace {
 std::unique_ptr<KeyedService> BuildHistoryService(web::BrowserState* context) {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
-  return base::WrapUnique(new history::HistoryService(
+  return base::MakeUnique<history::HistoryService>(
       base::WrapUnique(new HistoryClientImpl(
           ios::BookmarkModelFactory::GetForBrowserState(browser_state))),
-      nullptr));
+      nullptr);
 }
 
 std::unique_ptr<KeyedService> BuildBookmarkModel(web::BrowserState* context) {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
   std::unique_ptr<bookmarks::BookmarkModel> bookmark_model(
       new bookmarks::BookmarkModel(
-          base::WrapUnique(new BookmarkClientImpl(browser_state))));
+          base::MakeUnique<BookmarkClientImpl>(browser_state)));
   bookmark_model->Load(
       browser_state->GetPrefs(),
       browser_state->GetStatePath(), browser_state->GetIOTaskRunner(),
       web::WebThread::GetTaskRunnerForThread(web::WebThread::UI));
   return std::move(bookmark_model);
 }
 
 void NotReachedErrorCallback(WebDataServiceWrapper::ErrorType,
                              sql::InitStatus,
                              const std::string&) {
   NOTREACHED();
 }
 
 std::unique_ptr<KeyedService> BuildWebDataService(web::BrowserState* context) {
   const base::FilePath& browser_state_path = context->GetStatePath();
-  return base::WrapUnique(new WebDataServiceWrapper(
+  return base::MakeUnique<WebDataServiceWrapper>(
       browser_state_path, GetApplicationContext()->GetApplicationLocale(),
       web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
       web::WebThread::GetTaskRunnerForThread(web::WebThread::DB),
       ios::sync_start_util::GetFlareForSyncableService(browser_state_path),
-      &NotReachedErrorCallback));
+      &NotReachedErrorCallback);
 }
 
 base::FilePath CreateTempBrowserStateDir(base::ScopedTempDir* temp_dir) {
   DCHECK(temp_dir);
   if (!temp_dir->CreateUniqueTempDir()) {
     // Fallback logic in case we fail to create unique temporary directory.
     LOG(ERROR) << "Failed to create unique temporary directory.";
     base::FilePath system_tmp_dir;
     bool success = PathService::Get(base::DIR_TEMP, &system_tmp_dir);
 
@@ skipping 321 matching lines @@
   pref_service_ = std::move(prefs);
 }
 
 std::unique_ptr<TestChromeBrowserState>
 TestChromeBrowserState::Builder::Build() {
   DCHECK(!build_called_);
   return base::WrapUnique(new TestChromeBrowserState(
       state_path_, std::move(pref_service_), testing_factories_,
       refcounted_testing_factories_));
 }