Remove use of stl_util in search_engines.

chrome/browser/ui/search_engines/edit_search_engine_controller.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 "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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/user_metrics.h"
 #include "url/gurl.h"
@@ skipping 80 matching lines @@
     // TODO(pamg): Really, we should modify the entry so this later one
     // overwrites it. But we don't expect this case to be common.
     CleanUpCancelledAdd();
     return;
   }
 
   if (!edit_keyword_delegate_) {
     // 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.
     edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
                                             keyword_input, url_string);
   }
 }
 
 void EditSearchEngineController::CleanUpCancelledAdd() {
   if (!edit_keyword_delegate_ && template_url_) {
@@ skipping 22 matching lines @@
   std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("x")),
       TemplateURLServiceFactory::GetForProfile(profile_)->search_terms_data()));
   url::Parsed parts;
   std::string scheme(url_formatter::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid())
     url.insert(0, scheme + "://");
 
   return url;
 }