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

components/omnibox/browser/scored_history_match_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 "components/omnibox/browser/scored_history_match.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "base/auto_reset.h"
@@ skipping 254 matching lines @@
   // Now allow credit for the match in the scheme.
   base::AutoReset<bool> reset(&ScoredHistoryMatch::allow_scheme_matches_, true);
   ScoredHistoryMatch scored_with_scheme(row, visits, ASCIIToUTF16("fed http"),
       Make2Terms("fed", "http"), two_words_no_offsets, word_starts, false,
       nullptr, now);
   EXPECT_GT(scored_with_scheme.raw_score, 0);
 }
 
 TEST_F(ScoredHistoryMatchTest, CullSearchResults) {
   std::unique_ptr<TemplateURLService> template_url_service =
-      base::WrapUnique(new TemplateURLService(
+      base::MakeUnique<TemplateURLService>(
           nullptr, base::WrapUnique(new SearchTermsData), nullptr,
           std::unique_ptr<TemplateURLServiceClient>(), nullptr, nullptr,
-          base::Closure()));
+          base::Closure());
 
   // We use NowFromSystemTime() because MakeURLRow uses the same function
   // to calculate last visit time when building a row.
   base::Time now = base::Time::NowFromSystemTime();
 
   // Pretend we've visited a search engine query URL, but that it's not
   // associated with the default search engine.
   history::URLRow row(MakeURLRow(
       "http://testsearch.com/thequery", "Test Search Engine", 3, 30, 1));
   RowWordStarts word_starts;
@@ skipping 365 matching lines @@
 
   EXPECT_TRUE(
       ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str, &hqp_buckets));
   EXPECT_THAT(hqp_buckets, ElementsAre(Pair(0.0, 400), Pair(1.5, 600),
                                        Pair(12.0, 1300), Pair(20.0, 1399)));
   // invalid string.
   buckets_str = "0.0,400,1.5,600";
   EXPECT_FALSE(
       ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str, &hqp_buckets));
 }