Remove use of stl_util in search_engines.

chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stddef.h>
 #include <stdio.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 248 matching lines @@
     ASSERT_TRUE(model);
 
     search_test_utils::WaitForTemplateURLServiceToLoad(model);
 
     ASSERT_TRUE(model->loaded());
 
     TemplateURLData data;
     data.SetShortName(ASCIIToUTF16(kSearchShortName));
     data.SetKeyword(ASCIIToUTF16(kSearchKeyword));
     data.SetURL(kSearchURL);
-    TemplateURL* template_url = new TemplateURL(data);
-    model->Add(template_url);
+    TemplateURL* template_url = model->Add(base::MakeUnique<TemplateURL>(data));
     model->SetUserSelectedDefaultSearchProvider(template_url);
 
     data.SetKeyword(ASCIIToUTF16(kSearchKeyword2));
-    model->Add(new TemplateURL(data));
+    model->Add(base::MakeUnique<TemplateURL>(data));
 
     // Remove built-in template urls, like google.com, bing.com etc., as they
     // may appear as autocomplete suggests and interfere with our tests.
     TemplateURLService::TemplateURLVector urls = model->GetTemplateURLs();
     for (TemplateURLService::TemplateURLVector::const_iterator i = urls.begin();
          i != urls.end();
          ++i) {
       if ((*i)->prepopulate_id() != 0)
         model->Remove(*i);
     }
@@ skipping 337 matching lines @@
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
 
   // Add a non-substituting keyword. This ensures the popup will have a
   // non-verbatim entry with "ab" as a prefix. This way, by arrowing down, we
   // can set "abc" as temporary text in the omnibox.
   TemplateURLData data;
   data.SetShortName(ASCIIToUTF16("abc"));
   data.SetKeyword(ASCIIToUTF16(kSearchText));
   data.SetURL("http://abc.com/");
-  template_url_service->Add(new TemplateURL(data));
+  template_url_service->Add(base::MakeUnique<TemplateURL>(data));
 
   // Send "ab", so that an "abc" entry appears in the popup.
   const ui::KeyboardCode kSearchTextPrefixKeys[] = {
     ui::VKEY_A, ui::VKEY_B, ui::VKEY_UNKNOWN
   };
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextPrefixKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Arrow down to the "abc" entry in the popup.
@@ skipping 455 matching lines @@
   Profile* profile = browser()->profile();
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
 
   // Add a non-default substituting keyword.
   TemplateURLData data;
   data.SetShortName(ASCIIToUTF16("Search abc"));
   data.SetKeyword(ASCIIToUTF16(kSearchText));
   data.SetURL("http://abc.com/{searchTerms}");
   TemplateURL* template_url = new TemplateURL(data);
-  template_url_service->Add(template_url);
+  template_url_service->Add(base::WrapUnique(template_url));

[Peter Kasting, 2016/09/01 08:21:39]

Nit: Can be

  TemplateURL* template_url =
      template_url_service->Add(base::MakeUnique<TemplateURL>(data));

[Avi (use Gerrit), 2016/09/01 15:14:47]

Done.

 
   omnibox_view->SetUserText(base::string16());
 
   // Non-default substituting keyword shouldn't be matched by default.
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Check if the default match result is Search Primary Provider.
   ASSERT_EQ(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
             popup_model->result().default_match()->type);
   ASSERT_EQ(kSearchTextURL,
             popup_model->result().default_match()->destination_url.spec());
 
   omnibox_view->SetUserText(base::string16());
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_FALSE(popup_model->IsOpen());
 
   // Try a non-substituting keyword.
   template_url_service->Remove(template_url);
   data.SetShortName(ASCIIToUTF16("abc"));
   data.SetURL("http://abc.com/");
-  template_url_service->Add(new TemplateURL(data));
+  template_url_service->Add(base::MakeUnique<TemplateURL>(data));
 
   // We always allow exact matches for non-substituting keywords.
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
   ASSERT_EQ(AutocompleteMatchType::HISTORY_KEYWORD,
             popup_model->result().default_match()->type);
   ASSERT_EQ("http://abc.com/",
             popup_model->result().default_match()->destination_url.spec());
 }
@@ skipping 837 matching lines @@
 
   // Now Shift+Right should do nothing, and Shift+Left should reduce.
   // At the end, so Shift+Right should do nothing.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN));
   EXPECT_EQ(2u, GetSelectionSize(omnibox_view));
 
   // And Left should reduce by one character.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN));
   EXPECT_EQ(1u, GetSelectionSize(omnibox_view));
 }