Remove use of stl_util in search_engines.

chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc

 // Copyright 2015 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/android/contextualsearch/contextual_search_delegate.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/base64.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_context.h"
 #include "chrome/browser/android/contextualsearch/resolved_search_term.h"
 #include "chrome/browser/android/proto/client_discourse_context.pb.h"
 #include "components/search_engines/template_url_service.h"
 #include "net/base/escape.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 38 matching lines @@
     display_text_ = "unknown";
     context_language_ = "";
   }
 
   TemplateURLService* CreateTemplateURLService() {
     // Set a default search provider that supports Contextual Search.
     TemplateURLData data;
     data.SetURL("https://foobar.com/url?bar={searchTerms}");
     data.contextual_search_url = "https://foobar.com/_/contextualsearch?"
         "{google:contextualSearchVersion}{google:contextualSearchContextData}";
-    TemplateURL* template_url = new TemplateURL(data);
-    // Takes ownership of |template_url|.
     TemplateURLService* template_url_service = new TemplateURLService(NULL, 0);
-    template_url_service->Add(template_url);
+    TemplateURL* template_url =
+        template_url_service->Add(base::MakeUnique<TemplateURL>(data));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
     return template_url_service;
   }
 
   void CreateDefaultSearchContextAndRequestSearchTerm() {
     base::string16 surrounding = base::UTF8ToUTF16("Barack Obama just spoke.");
     CreateSearchContextAndRequestSearchTerm("Barack Obama", surrounding, 0, 6);
   }
 
   void CreateSearchContextAndRequestSearchTerm(
@@ skipping 446 matching lines @@
   EXPECT_EQ("obama", display_text());
   EXPECT_EQ("/m/02mjmr", mid());
   EXPECT_TRUE(do_prevent_preload());
   EXPECT_EQ("de", context_language());
 }
 
 TEST_F(ContextualSearchDelegateTest, HeaderContainsBasePageUrl) {
   CreateDefaultSearchContextAndRequestSearchTerm();
   EXPECT_EQ(kSomeSpecificBasePage, getBasePageUrlFromRequest());
 }