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

components/omnibox/browser/shortcuts_provider_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/shortcuts_provider.h"
 
 #include <math.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ skipping 166 matching lines @@
     "Trailing2 - Space in Shortcut", "0,1",
     "Trailing2 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED,
     AutocompleteMatchType::HISTORY_URL, "", 1, 100 },
 };
 
 class FakeAutocompleteProviderClient
     : public testing::NiceMock<MockAutocompleteProviderClient> {
  public:
   FakeAutocompleteProviderClient()
       : db_thread_("Test DB thread"), pool_owner_(3, "Background Pool") {
-    set_template_url_service(
-        base::WrapUnique(new TemplateURLService(nullptr, 0)));
+    set_template_url_service(base::MakeUnique<TemplateURLService>(nullptr, 0));
     if (history_dir_.CreateUniqueTempDir()) {
       history_service_ = history::CreateHistoryService(history_dir_.path(),
                                                        true);
     }
 
     db_thread_.Start();
     shortcuts_backend_ = new ShortcutsBackend(
-        GetTemplateURLService(), base::WrapUnique(new SearchTermsData()),
+        GetTemplateURLService(), base::MakeUnique<SearchTermsData>(),
         history_service_.get(), db_thread_.task_runner(), base::FilePath(),
         true);
     shortcuts_backend_->Init();
   }
 
   ~FakeAutocompleteProviderClient() override { db_thread_.Stop(); }
 
   history::HistoryService* GetHistoryService() override {
     return history_service_.get();
   }
@@ skipping 538 matching lines @@
 }
 
 TEST_F(ShortcutsProviderTest, DoesNotProvideOnFocus) {
   AutocompleteInput input(ASCIIToUTF16("about:o"), base::string16::npos,
                           std::string(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC, false,
                           false, true, true, true, TestSchemeClassifier());
   provider_->Start(input, false);
   EXPECT_TRUE(provider_->matches().empty());
 }