Remove use of stl_util in search_engines.

components/omnibox/browser/autocomplete_provider_unittest.cc

 // 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.
 
 #include "components/omnibox/browser/autocomplete_provider.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 284 matching lines @@
   EXPECT_TRUE(client_owned_);
 }
 
 void AutocompleteProviderTest::RegisterTemplateURL(
     const base::string16 keyword,
     const std::string& template_url) {
   TemplateURLData data;
   data.SetURL(template_url);
   data.SetShortName(keyword);
   data.SetKeyword(keyword);
-  TemplateURL* default_t_url = new TemplateURL(data);
+  std::unique_ptr<TemplateURL> default_turl_ptr =
+      base::MakeUnique<TemplateURL>(data);
+  TemplateURL* default_turl = default_turl_ptr.get();
   TemplateURLService* turl_model = client_->GetTemplateURLService();
-  turl_model->Add(default_t_url);
-  turl_model->SetUserSelectedDefaultSearchProvider(default_t_url);
+  turl_model->Add(std::move(default_turl_ptr));

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

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

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

Done.

+  turl_model->SetUserSelectedDefaultSearchProvider(default_turl);
   turl_model->Load();
-  TemplateURLID default_provider_id = default_t_url->id();
+  TemplateURLID default_provider_id = default_turl->id();
   ASSERT_NE(0, default_provider_id);
 }
 
 void AutocompleteProviderTest::ResetControllerWithTestProviders(
     bool same_destinations,
     TestProvider** provider1_ptr,
     TestProvider** provider2_ptr) {
   // TODO: Move it outside this method, after refactoring the existing
   // unit tests.  Specifically:
   //   (1) Make sure that AutocompleteMatch.keyword is set iff there is
@@ skipping 39 matching lines @@
   if (provider2_ptr)
     *provider2_ptr = provider2;
 }
 
 void AutocompleteProviderTest::ResetControllerWithKeywordAndSearchProviders() {
   // Reset the default TemplateURL.
   TemplateURLData data;
   data.SetShortName(base::ASCIIToUTF16("default"));
   data.SetKeyword(base::ASCIIToUTF16("default"));
   data.SetURL("http://defaultturl/{searchTerms}");
-  TemplateURL* default_t_url = new TemplateURL(data);
+  std::unique_ptr<TemplateURL> default_turl_ptr =
+      base::MakeUnique<TemplateURL>(data);
+  TemplateURL* default_turl = default_turl_ptr.get();
   TemplateURLService* turl_model = client_->GetTemplateURLService();
-  turl_model->Add(default_t_url);
-  turl_model->SetUserSelectedDefaultSearchProvider(default_t_url);
-  TemplateURLID default_provider_id = default_t_url->id();
+  turl_model->Add(std::move(default_turl_ptr));

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

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

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

Done.

+  turl_model->SetUserSelectedDefaultSearchProvider(default_turl);
+  TemplateURLID default_provider_id = default_turl->id();
   ASSERT_NE(0, default_provider_id);
 
   // Create another TemplateURL for KeywordProvider.
   TemplateURLData data2;
   data2.SetShortName(base::ASCIIToUTF16("k"));
   data2.SetKeyword(base::ASCIIToUTF16("k"));
   data2.SetURL("http://keyword/{searchTerms}");
-  TemplateURL* keyword_t_url = new TemplateURL(data2);
-  turl_model->Add(keyword_t_url);
-  ASSERT_NE(0, keyword_t_url->id());
+  std::unique_ptr<TemplateURL> keyword_turl_ptr =
+      base::MakeUnique<TemplateURL>(data2);
+  TemplateURL* keyword_turl = keyword_turl_ptr.get();
+  turl_model->Add(std::move(keyword_turl_ptr));
+  ASSERT_NE(0, keyword_turl->id());
 
   ResetControllerWithType(AutocompleteProvider::TYPE_KEYWORD |
                           AutocompleteProvider::TYPE_SEARCH);
 }
 
 void AutocompleteProviderTest::ResetControllerWithKeywordProvider() {
   TemplateURLService* turl_model = client_->GetTemplateURLService();
 
   // Create a TemplateURL for KeywordProvider.
   TemplateURLData data;
   data.SetShortName(base::ASCIIToUTF16("foo.com"));
   data.SetKeyword(base::ASCIIToUTF16("foo.com"));
   data.SetURL("http://foo.com/{searchTerms}");
-  TemplateURL* keyword_t_url = new TemplateURL(data);
-  turl_model->Add(keyword_t_url);
-  ASSERT_NE(0, keyword_t_url->id());
+  std::unique_ptr<TemplateURL> keyword_turl_ptr =
+      base::MakeUnique<TemplateURL>(data);
+  TemplateURL* keyword_turl = keyword_turl_ptr.get();
+  turl_model->Add(std::move(keyword_turl_ptr));

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

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

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

Done.

+  ASSERT_NE(0, keyword_turl->id());
 
   // Make a TemplateURL for KeywordProvider that a shorter version of the
   // first.
   data.SetShortName(base::ASCIIToUTF16("f"));
   data.SetKeyword(base::ASCIIToUTF16("f"));
   data.SetURL("http://f.com/{searchTerms}");
-  keyword_t_url = new TemplateURL(data);
-  turl_model->Add(keyword_t_url);
-  ASSERT_NE(0, keyword_t_url->id());
+  keyword_turl_ptr = base::MakeUnique<TemplateURL>(data);
+  keyword_turl = keyword_turl_ptr.get();
+  turl_model->Add(std::move(keyword_turl_ptr));

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

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

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

Done.

+  ASSERT_NE(0, keyword_turl->id());
 
   // Create another TemplateURL for KeywordProvider.
   data.SetShortName(base::ASCIIToUTF16("bar.com"));
   data.SetKeyword(base::ASCIIToUTF16("bar.com"));
   data.SetURL("http://bar.com/{searchTerms}");
-  keyword_t_url = new TemplateURL(data);
-  turl_model->Add(keyword_t_url);
-  ASSERT_NE(0, keyword_t_url->id());
+  keyword_turl_ptr = base::MakeUnique<TemplateURL>(data);
+  keyword_turl = keyword_turl_ptr.get();
+  turl_model->Add(std::move(keyword_turl_ptr));

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

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

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

Done.

+  ASSERT_NE(0, keyword_turl->id());
 
   ResetControllerWithType(AutocompleteProvider::TYPE_KEYWORD);
 }
 
 void AutocompleteProviderTest::ResetControllerWithType(int type) {
   EXPECT_FALSE(client_owned_);
   controller_.reset(
       new AutocompleteController(base::WrapUnique(client_), nullptr, type));
   client_owned_ = true;
 }
@@ skipping 338 matching lines @@
   EXPECT_FALSE(search_provider_field_trial_triggered_in_session());
   url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
   EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path());
 
   // Test page classification and field trial triggered set.
   set_search_provider_field_trial_triggered_in_session(true);
   EXPECT_TRUE(search_provider_field_trial_triggered_in_session());
   url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
   EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path());
 }