Eliminate ScopedVector in components/omnibox.

components/omnibox/browser/base_search_provider.cc

Index: components/omnibox/browser/base_search_provider.cc
diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
index 0c1feb15addfdd08e465f7df20c7dda6f91a0e64..defdca13c4ab390baa78dc60a07b2d15f90e79f9 100644
--- a/components/omnibox/browser/base_search_provider.cc
+++ b/components/omnibox/browser/base_search_provider.cc
@@ -125,11 +125,11 @@ AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion(
 void BaseSearchProvider::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(match.deletable);
   if (!match.GetAdditionalInfo(BaseSearchProvider::kDeletionUrlKey).empty()) {
-    deletion_handlers_.push_back(new SuggestionDeletionHandler(
+    deletion_handlers_.push_back(make_scoped_ptr(new SuggestionDeletionHandler(
         match.GetAdditionalInfo(BaseSearchProvider::kDeletionUrlKey),
         client_->GetRequestContext(),
         base::Bind(&BaseSearchProvider::OnDeletionComplete,
-                   base::Unretained(this))));
+                   base::Unretained(this)))));
   }
 
   TemplateURL* template_url =
@@ -482,8 +482,7 @@ void BaseSearchProvider::DeleteMatchFromMatches(
 void BaseSearchProvider::OnDeletionComplete(
     bool success, SuggestionDeletionHandler* handler) {
   RecordDeletionResult(success);
-  SuggestionDeletionHandlers::iterator it = std::find(
-      deletion_handlers_.begin(), deletion_handlers_.end(), handler);
-  DCHECK(it != deletion_handlers_.end());
-  deletion_handlers_.erase(it);
+  deletion_handlers_.erase(std::remove_if(
+      deletion_handlers_.begin(), deletion_handlers_.end(),
+      [handler](const auto& elem) { return elem.get() == handler; }));

[Peter Kasting, 2016/02/05 00:54:04]

You can't std::find() a raw pointer in a vector of scoped_ptrs anyway, so by the
time this was changed to find_if(), using remove_if() was easier.

 }