Remove use of stl_util in search_engines.

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 854a6a28cbb3f95e57ed82633f8a8b5b7c31d4ee..13d71a51a880839bc2db596abc082ccba6a58bfc 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
@@ -75,7 +76,7 @@ class SearchTest : public BrowserWithTestWindowTest {
 
     TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership of |template_url|.

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

Nit: Comment is now redundant.

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

Done.

-    template_url_service->Add(template_url);
+    template_url_service->Add(base::WrapUnique(template_url));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   }
 
@@ -99,8 +100,7 @@ class SearchTest : public BrowserWithTestWindowTest {
     data.search_terms_replacement_key = "strk";
 
     TemplateURL* template_url = new TemplateURL(data);
-    // Takes ownership of |template_url|.
-    template_url_service->Add(template_url);
+    template_url_service->Add(base::WrapUnique(template_url));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   }
 
@@ -496,8 +496,7 @@ TEST_F(SearchTest, CommandLineOverrides) {
   data.instant_url = "{google:baseURL}webhp?strk";
   data.search_terms_replacement_key = "strk";
   TemplateURL* template_url = new TemplateURL(data);
-  // Takes ownership of |template_url|.
-  template_url_service->Add(template_url);
+  template_url_service->Add(base::WrapUnique(template_url));
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
 
   // By default, Instant Extended forces the instant URL to be HTTPS, so even if
@@ -629,7 +628,7 @@ TEST_F(SearchTest, SearchProviderWithPort) {
   data.search_terms_replacement_key = "strk";
 
   TemplateURL* template_url = new TemplateURL(data);
-  template_url_service->Add(template_url); // Takes ownership of |template_url|.
+  template_url_service->Add(base::WrapUnique(template_url));
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
 
   EXPECT_TRUE(ShouldAssignURLToInstantRenderer(
@@ -658,7 +657,7 @@ class SearchURLTest : public SearchTest {
     data.search_terms_replacement_key = "espv";
     template_url_ = new TemplateURL(data);
     // |template_url_service| takes ownership of |template_url_|.

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

Nit: Comment is now redundant.

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

Done.

-    template_url_service->Add(template_url_);
+    template_url_service->Add(base::WrapUnique(template_url_));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url_);
   }