Remove use of stl_util in search_engines.

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 294 matching lines @@
                               Make1Term("testsearch"), one_word_no_offset,
                               word_starts, false, template_url_service.get(),
                               now);
   EXPECT_GT(scored_b.raw_score, 0);
 
   // Set up a default search engine associated with this URL.
   TemplateURLData data;
   data.SetShortName(ASCIIToUTF16("TestEngine"));
   data.SetKeyword(ASCIIToUTF16("TestEngine"));
   data.SetURL("http://testsearch.com/{searchTerms}");
-  TemplateURL* template_url = new TemplateURL(data);
-  template_url_service->Add(template_url);
+  std::unique_ptr<TemplateURL> template_url_ptr =
+      base::MakeUnique<TemplateURL>(data);
+  TemplateURL* template_url = template_url_ptr.get();
+  template_url_service->Add(std::move(template_url_ptr));

[Peter Kasting, 2016/08/31 04:12:56]

Nit: Just use the old code and add a WrapUnique() call.

[Avi (use Gerrit), 2016/09/01 00:34:26]

Done.

   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   template_url_service->Load();
 
   // The search results page should not be returned when typing a query.
   ScoredHistoryMatch scored_c(row, visits, ASCIIToUTF16("thequery"),
                               Make1Term("thequery"), one_word_no_offset,
                               word_starts, false, template_url_service.get(),
                               now);
   EXPECT_EQ(0, scored_c.raw_score);
 
@@ skipping 327 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));
 }