Remove use of stl_util in search_engines.

chrome/browser/sync/test/integration/search_engines_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_
 
 #include <map>
+#include <memory>
 #include <string>
 
 #include "base/strings/string16.h"
 
 class Profile;
 class TemplateURL;
 class TemplateURLService;
 
 typedef std::map<std::string, const TemplateURL*> GUIDToTURLMap;
 
 namespace search_engines_helper {
 
 // Used to access the search engines within a particular sync profile.
 TemplateURLService* GetServiceForBrowserContext(int profile_index);
 
 // Used to access the search engines within the verifier sync profile.
 TemplateURLService* GetVerifierService();
 
 // Compared a single TemplateURLService for a given profile to the verifier.
 // Retrns true iff their user-visible fields match.
 bool ServiceMatchesVerifier(int profile_index);
 
 // Blocks until either AllServicesMatch returns true or a timeout occurs.
 // Returns true if AllServicesMatch succeeded, false if timeout.
 bool AwaitAllServicesMatch();
 
 // Returns true iff all TemplateURLServices match with the verifier.
 bool AllServicesMatch();
 
-// Create a TemplateURL with some test values based on |seed|. The caller owns
-// the returned TemplateURL*.
-TemplateURL* CreateTestTemplateURL(Profile* profile,
-                                   int seed,
-                                   const base::string16& keyword,
-                                   const std::string& sync_guid);
-TemplateURL* CreateTestTemplateURL(Profile* profile,
-                                   int seed,
-                                   const base::string16& keyword,
-                                   const std::string& url,
-                                   const std::string& sync_guid);
+// Create a TemplateURL with some test values based on |seed|.
+std::unique_ptr<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& url,
+    const std::string& sync_guid);
 
 // Add a search engine based on a seed to the service at index |profile_index|
 // and the verifier if it is used.
 void AddSearchEngine(int profile_index, int seed);
 
 // Retrieves a search engine from the service at index |profile_index| with
 // original keyword |keyword| and changes its user-visible fields. Does the same
 // to the verifier, if it is used.
 void EditSearchEngine(int profile_index,
                       const base::string16& keyword,
@@ skipping 10 matching lines @@
 // is used.
 void ChangeDefaultSearchProvider(int profile_index, int seed);
 
 // Returns true if the profile at |profile_index| has a search engine matching
 // the search engine generated with |seed|.
 bool HasSearchEngine(int profile_index, int seed);
 
 }  // namespace search_engines_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SEARCH_ENGINES_HELPER_H_