Remove use of stl_util in search_engines.

chrome/browser/ui/search/new_tab_page_interceptor_browsertest.cc

 // Copyright 2015 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 "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/search_test_utils.h"
@@ skipping 35 matching lines @@
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service);
     UIThreadSearchTermsData::SetGoogleBaseURL("https://mock.http/");
     std::string base_url("{google:baseURL}");
     TemplateURLData data;
     data.SetShortName(base::ASCIIToUTF16("Google"));
     data.SetKeyword(base::UTF8ToUTF16(base_url));
     data.SetURL(base_url + "url?bar={searchTerms}");
     data.new_tab_url = base_url + new_tab_path;
     TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership of |template_url|.

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

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);
   }
 
  private:
   GURL new_tab_url_;
   base::FilePath path_;
 };
 
 IN_PROC_BROWSER_TEST_F(NewTabPageInterceptorTest, NoInterception) {
   set_new_tab_url(
@@ skipping 40 matching lines @@
   ChangeDefaultSearchProvider("notarealfile.html");
 
   ui_test_utils::NavigateToURL(browser(), new_tab_url());
   content::WebContents* contents =
       browser()->tab_strip_model()->GetWebContentsAt(0);
   content::NavigationController* controller = &contents->GetController();
   // Failed navigation makes a redirect to the local NTP.
   EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl),
             controller->GetLastCommittedEntry()->GetURL());
 }