Remove use of stl_util in search_engines.

chrome/browser/search/search_unittest.cc

 // Copyright (c) 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.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"
@@ skipping 48 matching lines @@
     data.instant_url = "http://foo.com/instant?"
         "{google:forceInstantResults}foo=foo#foo=foo&strk";
     if (set_ntp_url) {
       data.new_tab_url = (insecure_ntp_url ? "http" : "https") +
           std::string("://foo.com/newtab?strk");
     }
     data.alternate_urls.push_back("http://foo.com/alt#quux={searchTerms}");
     data.search_terms_replacement_key = "strk";
 
     TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership of |template_url|.

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

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);
   }
 
   // Build an Instant URL with or without a valid search terms replacement key
   // as per |has_search_term_replacement_key|. Set that URL as the instant URL
   // for the default search provider.
   void SetDefaultInstantTemplateUrl(bool has_search_term_replacement_key) {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
 
     static const char kInstantURLWithStrk[] =
         "http://foo.com/instant?foo=foo#foo=foo&strk";
     static const char kInstantURLNoStrk[] =
         "http://foo.com/instant?foo=foo#foo=foo";
 
     TemplateURLData data;
     data.SetShortName(base::ASCIIToUTF16("foo.com"));
     data.SetURL("http://foo.com/url?bar={searchTerms}");
     data.instant_url = (has_search_term_replacement_key ?
         kInstantURLWithStrk : kInstantURLNoStrk);
     data.search_terms_replacement_key = "strk";
 
     TemplateURL* template_url = new TemplateURL(data);
-    // Takes ownership of |template_url|.
-    template_url_service->Add(template_url);
+    template_url_service->Add(base::WrapUnique(template_url));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   }
 
   bool InInstantProcess(const content::WebContents* contents) {
     InstantService* instant_service =
         InstantServiceFactory::GetForProfile(profile());
     return instant_service->IsInstantProcess(
         contents->GetRenderProcessHost()->GetID());
   }
 
@@ skipping 375 matching lines @@
 
 TEST_F(SearchTest, CommandLineOverrides) {
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   TemplateURLData data;
   data.SetShortName(base::ASCIIToUTF16("Google"));
   data.SetURL("{google:baseURL}search?q={searchTerms}");
   data.instant_url = "{google:baseURL}webhp?strk";
   data.search_terms_replacement_key = "strk";
   TemplateURL* template_url = new TemplateURL(data);
-  // Takes ownership of |template_url|.
-  template_url_service->Add(template_url);
+  template_url_service->Add(base::WrapUnique(template_url));
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
 
   // By default, Instant Extended forces the instant URL to be HTTPS, so even if
   // we set a Google base URL that is HTTP, we should get an HTTPS URL.
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.foo.com/");
   GURL instant_url(GetInstantURL(profile(), false));
   ASSERT_TRUE(instant_url.is_valid());
   EXPECT_EQ("https://www.foo.com/webhp?strk", instant_url.spec());
 
   // However, if the Google base URL is specified on the command line, the
@@ skipping 111 matching lines @@
   data.SetShortName(base::ASCIIToUTF16("localhost"));
   data.SetURL("https://[::1]:1993/url?bar={searchTerms}");
   data.instant_url =
       "https://[::1]:1993/instant?"
       "{google:forceInstantResults}foo=foo#foo=foo&strk";
   data.new_tab_url = "https://[::1]:1993/newtab?strk";
   data.alternate_urls.push_back("https://[::1]:1993/alt#quux={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
   TemplateURL* template_url = new TemplateURL(data);
-  template_url_service->Add(template_url); // Takes ownership of |template_url|.
+  template_url_service->Add(base::WrapUnique(template_url));
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
 
   EXPECT_TRUE(ShouldAssignURLToInstantRenderer(
       GURL("https://[::1]:1993/newtab?lala"), profile()));
   EXPECT_FALSE(ShouldAssignURLToInstantRenderer(
       GURL("https://[::1]:1992/newtab?lala"), profile()));
   EXPECT_EQ(GURL("chrome-search://remote-ntp/newtab?lala"),
             GetEffectiveURLForInstant(GURL("https://[::1]:1993/newtab?lala"),
                                       profile()));
   EXPECT_EQ(GURL("chrome-search://[::1]/instant?strk"),
             GetEffectiveURLForInstant(GURL("https://[::1]:1993/instant?strk"),
                                       profile()));
   EXPECT_FALSE(ShouldAssignURLToInstantRenderer(
       GURL("https://[::1]:1993/unregistered-path?strk"), profile()));
 }
 
 class SearchURLTest : public SearchTest {
  protected:
   void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url) override {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     TemplateURLData data;
     data.SetShortName(base::ASCIIToUTF16("Google"));
     data.SetURL("{google:baseURL}search?"
                 "{google:instantExtendedEnabledParameter}q={searchTerms}");
     data.search_terms_replacement_key = "espv";
     template_url_ = new TemplateURL(data);
     // |template_url_service| takes ownership of |template_url_|.

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

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_);
   }
 
   TemplateURL* template_url_;
 };
 
 TEST_F(SearchURLTest, QueryExtractionDisabled) {
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/");
   TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo"));
   GURL result(template_url_->url_ref().ReplaceSearchTerms(
       search_terms_args, UIThreadSearchTermsData(profile())));
   ASSERT_TRUE(result.is_valid());
   // Query extraction is disabled. Make sure
   // {google:instantExtendedEnabledParameter} is not set in the search URL.
   EXPECT_EQ("http://www.google.com/search?q=foo", result.spec());
 }
 
 }  // namespace search