Remove use of stl_util in search_engines.

components/omnibox/browser/shortcuts_backend_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/shortcuts_backend.h"
 
 #include <stddef.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 86 matching lines @@
   return ShortcutsBackend::MatchToMatchCore(match, template_url_service_.get(),
                                             &search_terms_data);
 }
 
 void ShortcutsBackendTest::SetSearchProvider() {
   TemplateURLData data;
   data.SetURL("http://foo.com/search?bar={searchTerms}");
   data.SetShortName(base::UTF8ToUTF16("foo"));
   data.SetKeyword(base::UTF8ToUTF16("foo"));
 
-  TemplateURL* template_url = new TemplateURL(data);
-  // Takes ownership of |template_url|.
-  template_url_service_->Add(template_url);
+  std::unique_ptr<TemplateURL> template_url_ptr =
+      base::MakeUnique<TemplateURL>(data);
+  TemplateURL* template_url = template_url_ptr.get();
+  template_url_service_->Add(std::move(template_url_ptr));

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

Nit: Just use the old code and add a WrapUnique() call.  (Leave the redundant
comment off though.)

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

Done.

   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
 void ShortcutsBackendTest::SetUp() {
   template_url_service_.reset(new TemplateURLService(nullptr, 0));
   if (profile_dir_.CreateUniqueTempDir())
     history_service_ = history::CreateHistoryService(profile_dir_.path(), true);
   ASSERT_TRUE(history_service_);
 
   db_thread_.Start();
@@ skipping 196 matching lines @@
   ASSERT_TRUE(shortcut4_iter != shortcuts_map().end());
   EXPECT_EQ(shortcut4.id, shortcut4_iter->second.id);
 
   ShortcutsDatabase::ShortcutIDs deleted_ids;
   deleted_ids.push_back(shortcut3.id);
   deleted_ids.push_back(shortcut4.id);
   EXPECT_TRUE(DeleteShortcutsWithIDs(deleted_ids));
 
   ASSERT_EQ(0U, shortcuts_map().size());
 }