Remove use of stl_util in search_engines.

chrome/browser/search/instant_unittest_base.cc

 // Copyright 2013 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/search/instant_unittest_base.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 42 matching lines @@
   TemplateURLData data;
   data.SetShortName(base::UTF8ToUTF16(base_url));
   data.SetKeyword(base::UTF8ToUTF16(base_url));
   data.SetURL(base_url + "url?bar={searchTerms}");
   data.instant_url =
       base_url + "instant?{google:forceInstantResults}foo=foo#foo=foo&strk";
   data.new_tab_url = base_url + "newtab";
   data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
-  TemplateURL* template_url = new TemplateURL(data);
-  // Takes ownership of |template_url|.
-  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:55]

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

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

Fixed.

   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 void InstantUnitTestBase::NotifyGoogleBaseURLUpdate(
     const std::string& new_google_base_url) {
   // GoogleURLTracker is not created in tests.
   // (See GoogleURLTrackerFactory::ServiceIsNULLWhileTesting())
   // For determining google:baseURL for NTP, the following is used:
   // UIThreadSearchTermsData::GoogleBaseURLValue()
   // For simulating test behavior, this is overridden below.
   UIThreadSearchTermsData::SetGoogleBaseURL(new_google_base_url);
   TemplateURLServiceFactory::GetForProfile(profile())->GoogleBaseURLChanged();
 }
 
 bool InstantUnitTestBase::IsInstantServiceObserver(
     const InstantServiceObserver* observer) const {
   return instant_service_->observers_.HasObserver(observer);
 }
 
 TestingProfile* InstantUnitTestBase::CreateProfile() {
   TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile, &TemplateURLServiceFactory::BuildInstanceFor);
   return profile;
 }