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

chrome/browser/ui/webui/options/startup_pages_handler.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.
 
 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 92 matching lines @@
       new CustomHomePagesTableModel(profile));
   startup_custom_pages_table_model_->SetObserver(this);
 
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kURLsToRestoreOnStartup,
       base::Bind(&StartupPagesHandler::UpdateStartupPages,
                  base::Unretained(this)));
 
   autocomplete_controller_.reset(new AutocompleteController(
-      base::WrapUnique(new ChromeAutocompleteProviderClient(profile)), this,
+      base::MakeUnique<ChromeAutocompleteProviderClient>(profile), this,
       AutocompleteClassifier::kDefaultOmniboxProviders));
 }
 
 void StartupPagesHandler::InitializePage() {
   UpdateStartupPages();
 }
 
 void StartupPagesHandler::OnModelChanged() {
   base::ListValue startup_pages;
   int page_count = startup_custom_pages_table_model_->RowCount();
@@ skipping 138 matching lines @@
 
 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   base::ListValue suggestions;
   OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);
   web_ui()->CallJavascriptFunctionUnsafe(
       "StartupOverlay.updateAutocompleteSuggestions", suggestions);
 }
 
 }  // namespace options