Remove use of stl_util in search_engines.

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index ebf9ea74f3f0d620b55716385c9b3f5562edb563..3d93af14b6d1eac3c2f07075c299d290191af84d 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -286,7 +286,7 @@ void SearchProviderTest::SetUp() {
   data.instant_url = "http://does/not/exist?strk=1";
   data.search_terms_replacement_key = "strk";
   default_t_url_ = new TemplateURL(data);
-  turl_model->Add(default_t_url_);
+  turl_model->Add(base::WrapUnique(default_t_url_));

[Peter Kasting, 2016/09/01 08:21:39]

Nit: These two lines could become:

  default_t_url_ = turl_model->Add(base::MakeUnique<TemplateURL>(data));

Also applies to the other changes in this file.

[Avi (use Gerrit), 2016/09/01 15:14:46]

Done.

   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
   TemplateURLID default_provider_id = default_t_url_->id();
   ASSERT_NE(0, default_provider_id);
@@ -300,7 +300,7 @@ void SearchProviderTest::SetUp() {
   data.SetURL("http://keyword/{searchTerms}");
   data.suggestions_url = "http://suggest_keyword/{searchTerms}";
   keyword_t_url_ = new TemplateURL(data);
-  turl_model->Add(keyword_t_url_);
+  turl_model->Add(base::WrapUnique(keyword_t_url_));
   ASSERT_NE(0, keyword_t_url_->id());
 
   // Add a page and search term for keyword_t_url_.
@@ -1162,7 +1162,7 @@ TEST_F(SearchProviderTest, CommandLineOverrides) {
   data.SetKeyword(data.short_name());
   data.SetURL("{google:baseURL}{searchTerms}");
   default_t_url_ = new TemplateURL(data);
-  turl_model->Add(default_t_url_);
+  turl_model->Add(base::WrapUnique(default_t_url_));
   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
 
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
@@ -3383,7 +3383,7 @@ TEST_F(SearchProviderTest, SuggestQueryUsesToken) {
   data.suggestions_url =
       "http://suggest/?q={searchTerms}&{google:sessionToken}";
   default_t_url_ = new TemplateURL(data);
-  turl_model->Add(default_t_url_);
+  turl_model->Add(base::WrapUnique(default_t_url_));
   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
 
   base::string16 term = term1_.substr(0, term1_.length() - 1);