[omnibox] Use more MakeUnique

Convert some bare new()s and a theoretical memory leak into
MakeUnique's.

Bug: 
Change-Id: I1e80714c42f2d7575e774ffdbe2b8f2d5c83c6de
Reviewed-on: https://chromium-review.googlesource.com/801350
Commit-Queue: Kevin Bailey <krb@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520801}

chrome/browser/autocomplete/autocomplete_classifier_factory.cc

@@ -39,12 +39,14 @@ AutocompleteClassifierFactory* AutocompleteClassifierFactory::GetInstance() {
 std::unique_ptr<KeyedService> AutocompleteClassifierFactory::BuildInstanceFor(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
+  auto provider_client =
+      base::MakeUnique<ChromeAutocompleteProviderClient>(profile);
+  auto controller = base::WrapUnique(new AutocompleteController(
+      std::move(provider_client), NULL,
+      AutocompleteClassifier::DefaultOmniboxProviders()));
   return base::MakeUnique<AutocompleteClassifier>(
-      base::WrapUnique(new AutocompleteController(
-          base::WrapUnique(new ChromeAutocompleteProviderClient(profile)), NULL,
-          AutocompleteClassifier::DefaultOmniboxProviders())),
-      std::unique_ptr<AutocompleteSchemeClassifier>(
-          new ChromeAutocompleteSchemeClassifier(profile)));
+      std::move(controller),
+      base::MakeUnique<ChromeAutocompleteSchemeClassifier>(profile));
 }
 
 AutocompleteClassifierFactory::AutocompleteClassifierFactory()

chrome/browser/autocomplete/search_provider_unittest.cc

@@ -1000,8 +1000,8 @@ TEST_F(SearchProviderTest, KeywordOrderingAndDescriptions) {
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   AutocompleteController controller(
-      base::WrapUnique(new ChromeAutocompleteProviderClient(&profile_)),
-      nullptr, AutocompleteProvider::TYPE_SEARCH);
+      base::MakeUnique<ChromeAutocompleteProviderClient>(&profile_), nullptr,
+      AutocompleteProvider::TYPE_SEARCH);
   AutocompleteInput input(ASCIIToUTF16("k t"),
                           metrics::OmniboxEventProto::OTHER,
                           ChromeAutocompleteSchemeClassifier(&profile_));

components/omnibox/browser/suggestion_answer.cc

@@ -195,7 +195,7 @@ SuggestionAnswer::~SuggestionAnswer() {}
 // static
 std::unique_ptr<SuggestionAnswer> SuggestionAnswer::ParseAnswer(
     const base::DictionaryValue* answer_json) {
-  auto result = base::WrapUnique(new SuggestionAnswer);
+  auto result = base::MakeUnique<SuggestionAnswer>();
 
   const base::ListValue* lines_json;
   if (!answer_json->GetList(kAnswerJsonLines, &lines_json) ||

components/omnibox/browser/suggestion_answer_unittest.cc

@@ -35,7 +35,7 @@ TEST(SuggestionAnswerTest, CopiesAreEqual) {
   SuggestionAnswer answer1;
   EXPECT_TRUE(answer1.Equals(SuggestionAnswer(answer1)));
 
-  auto answer2 = base::WrapUnique(new SuggestionAnswer);
+  auto answer2 = base::MakeUnique<SuggestionAnswer>();
   answer2->set_type(832345);
   EXPECT_TRUE(answer2->Equals(SuggestionAnswer(*answer2)));