Remove use of stl_util in search_engines.

chrome/browser/ui/search/instant_test_utils.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/ui/search/instant_test_utils.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/search_test_utils.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
@@ skipping 36 matching lines @@
   // search term extraction to work in InstantExtended.
   data.SetShortName(base::ASCIIToUTF16("name"));
   data.SetURL(instant_url_.spec() + "q={searchTerms}&is_search");
   data.instant_url = instant_url_.spec();
   data.new_tab_url = ntp_url_.spec();
   if (init_suggestions_url_)
     data.suggestions_url = instant_url_.spec() + "#q={searchTerms}";
   data.alternate_urls.push_back(instant_url_.spec() + "#q={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
-  TemplateURL* template_url = new TemplateURL(data);
-  service->Add(template_url);  // Takes ownership of |template_url|.
+  TemplateURL* template_url = service->Add(base::MakeUnique<TemplateURL>(data));
   service->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 void InstantTestBase::SetInstantURL(const std::string& url) {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   search_test_utils::WaitForTemplateURLServiceToLoad(service);
 
   TemplateURLData data;
   data.SetShortName(base::ASCIIToUTF16("name"));
   data.SetURL(url);
   data.instant_url = url;
 
-  TemplateURL* template_url = new TemplateURL(data);
-  service->Add(template_url);  // Takes ownership of |template_url|.
+  TemplateURL* template_url = service->Add(base::MakeUnique<TemplateURL>(data));
   service->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 void InstantTestBase::Init(const GURL& instant_url,
                            const GURL& ntp_url,
                            bool init_suggestions_url) {
   instant_url_ = instant_url;
   ntp_url_ = ntp_url;
   init_suggestions_url_ = init_suggestions_url;
 }
@@ skipping 76 matching lines @@
   return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);
 }
 
 base::string16 InstantTestBase::GetBlueText() {
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
   return omnibox()->GetText().substr(start, end - start);
 }