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

components/omnibox/browser/omnibox_edit_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.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 199 matching lines @@
   SessionID session_id_;
   TestingSchemeClassifier scheme_classifier_;
   AutocompleteClassifier autocomplete_classifier_;
   AutocompleteMatch alternate_nav_match_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxClient);
 };
 
 TestingOmniboxClient::TestingOmniboxClient()
     : autocomplete_classifier_(
-          base::WrapUnique(new AutocompleteController(
+          base::MakeUnique<AutocompleteController>(
               CreateAutocompleteProviderClient(),
               nullptr,
-              AutocompleteClassifier::kDefaultOmniboxProviders)),
-          base::WrapUnique(new TestingSchemeClassifier())) {}
+              AutocompleteClassifier::kDefaultOmniboxProviders),
+          base::MakeUnique<TestingSchemeClassifier>()) {}
 
 TestingOmniboxClient::~TestingOmniboxClient() {
   autocomplete_classifier_.Shutdown();
 }
 
 std::unique_ptr<AutocompleteProviderClient>
 TestingOmniboxClient::CreateAutocompleteProviderClient() {
   std::unique_ptr<MockAutocompleteProviderClient> provider_client(
       new MockAutocompleteProviderClient());
   EXPECT_CALL(*provider_client.get(), GetBuiltinURLs())
@@ skipping 164 matching lines @@
                      0);
   EXPECT_TRUE(AutocompleteInput::HasHTTPScheme(
       client->alternate_nav_match().fill_into_edit));
 
   model()->SetUserText(base::ASCIIToUTF16("ab cd"));
   model()->OpenMatch(match, CURRENT_TAB, alternate_nav_url, base::string16(),
                      0);
   EXPECT_TRUE(AutocompleteInput::HasHTTPScheme(
       client->alternate_nav_match().fill_into_edit));
 }