Remove use of stl_util in search_engines.

chrome/browser/ui/search_engines/edit_search_engine_controller.cc

Index: chrome/browser/ui/search_engines/edit_search_engine_controller.cc
diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
index 837c8ea5dee252d59aa34e57727e7697bba6556e..840f5ec304d6082a2d2b3359c3fb8d78ea07bda3 100644
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -104,9 +105,9 @@ void EditSearchEngineController::AcceptAddOrEdit(
     // Confiming an entry we got from JS. We have a template_url_, but it
     // hasn't yet been added to the model.
     DCHECK(template_url_);
-    // TemplateURLService takes ownership of template_url_.
-    template_url_service->AddWithOverrides(template_url_, title_input,
-                                           keyword_input, url_string);
+    template_url_service->AddWithOverrides(base::WrapUnique(template_url_),

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

Urgh, apparently sometimes this class owns this raw pointer and sometimes it
doesn't.  Pretty sure cleaning that up is beyond the scope of this CL...

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

Yep, this is super sloppy. I'm going to pass since this CL is ugly enough. If
you want to take a spare moment, I'll let you have fun with it.

[Peter Kasting, 2016/09/01 20:25:05]

Filed https://bugs.chromium.org/p/chromium/issues/detail?id=643358 .

+                                           title_input, keyword_input,
+                                           url_string);
     content::RecordAction(UserMetricsAction("KeywordEditor_AddKeywordJS"));
   } else {
     // Adding or modifying an entry via the Delegate.