Remove use of stl_util in search_engines.

chrome/browser/sync/test/integration/search_engines_helper.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 "chrome/browser/sync/test/integration/search_engines_helper.h"
 
 #include <stddef.h>
 
 #include <vector>
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/test/integration/await_match_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 158 matching lines @@
   for (int it = 1; it < test()->num_clients(); ++it) {
     if (!ServicesMatch(0, it)) {
       DVLOG(1) << "TemplateURLService " << it << " does not match with "
                << "service 0.";
       return false;
     }
   }
   return true;
 }
 
-TemplateURL* CreateTestTemplateURL(Profile* profile, int seed) {
+std::unique_ptr<TemplateURL> CreateTestTemplateURL(Profile* profile, int seed) {
   return CreateTestTemplateURL(profile, seed, CreateKeyword(seed),
                                base::StringPrintf("0000-0000-0000-%04d", seed));
 }
 
-TemplateURL* CreateTestTemplateURL(Profile* profile,
-                                   int seed,
-                                   const base::string16& keyword,
-                                   const std::string& sync_guid) {
+std::unique_ptr<TemplateURL> CreateTestTemplateURL(
+    Profile* profile,
+    int seed,
+    const base::string16& keyword,
+    const std::string& sync_guid) {
   return CreateTestTemplateURL(profile, seed, keyword,
       base::StringPrintf("http://www.test%d.com/", seed), sync_guid);
 }
 
-TemplateURL* CreateTestTemplateURL(Profile* profile,
-                                   int seed,
-                                   const base::string16& keyword,
-                                   const std::string& url,
-                                   const std::string& sync_guid) {
+std::unique_ptr<TemplateURL> CreateTestTemplateURL(
+    Profile* profile,
+    int seed,
+    const base::string16& keyword,
+    const std::string& url,
+    const std::string& sync_guid) {
   TemplateURLData data;
   data.SetShortName(CreateKeyword(seed));
   data.SetKeyword(keyword);
   data.SetURL(url);
   data.favicon_url = GURL("http://favicon.url");
   data.safe_for_autoreplace = true;
   data.date_created = base::Time::FromTimeT(100);
   data.last_modified = base::Time::FromTimeT(100);
   data.prepopulate_id = 999999;
   data.sync_guid = sync_guid;
-  return new TemplateURL(data);
+  return base::MakeUnique<TemplateURL>(data);
 }
 
 void AddSearchEngine(int profile_index, int seed) {
   Profile* profile = test()->GetProfile(profile_index);
   TemplateURLServiceFactory::GetForProfile(profile)->Add(
       CreateTestTemplateURL(profile, seed));
   if (test()->use_verifier())
     GetVerifierService()->Add(CreateTestTemplateURL(profile, seed));
 }
 
@@ skipping 48 matching lines @@
 }
 
 bool HasSearchEngine(int profile_index, int seed) {
   TemplateURLService* service = GetServiceForBrowserContext(profile_index);
   base::string16 keyword(CreateKeyword(seed));
   TemplateURL* turl = service->GetTemplateURLForKeyword(keyword);
   return turl != nullptr;
 }
 
 }  // namespace search_engines_helper