Remove use of stl_util in search_engines.

chrome/browser/search/instant_service_unittest.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/search/instant_service.h"
 
 #include <memory>
 #include <string>
 #include <tuple>
 #include <vector>
 
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/common/render_messages.h"
@@ skipping 103 matching lines @@
 TEST_F(InstantServiceEnabledTest,
        ResetInstantSearchPrerenderer_DefaultProviderChanged) {
   EXPECT_CALL(*instant_service_observer_.get(),
               DefaultSearchProviderChanged(false)).Times(2);
 
   // Set a default search provider that doesn't support Instant.
   TemplateURLData data;
   data.SetShortName(base::ASCIIToUTF16("foobar.com"));
   data.SetURL("https://foobar.com/url?bar={searchTerms}");
   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:25]

Done.

-  template_url_service_->Add(template_url);
+  template_url_service_->Add(base::WrapUnique(template_url));
   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
 
   EXPECT_EQ(static_cast<InstantSearchPrerenderer*>(NULL),
             GetInstantSearchPrerenderer());
 
   // Set a default search provider that supports Instant and make sure
   // InstantSearchPrerenderer is valid.
   SetUserSelectedDefaultSearchProvider("https://google.com/");
   EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL),
             GetInstantSearchPrerenderer());
@@ skipping 15 matching lines @@
 TEST_F(InstantServiceTest, GetSuggestionFromClientSide) {
   history::MostVisitedURLList url_list;
   url_list.push_back(history::MostVisitedURL());
 
   instant_service_->OnMostVisitedItemsReceived(url_list);
 
   auto items = instant_service_->most_visited_items_;
   ASSERT_EQ(1, (int)items.size());
   ASSERT_FALSE(items[0].is_server_side_suggestion);
 }