Remove stl_util's deletion function use from chrome/.

chrome/browser/ui/search_engines/template_url_table_model.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/template_url_table_model.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 113 matching lines @@
       template_url_service_(template_url_service),
       favicon_service_(favicon_service) {
   DCHECK(template_url_service);
   template_url_service_->Load();
   template_url_service_->AddObserver(this);
   Reload();
 }
 
 TemplateURLTableModel::~TemplateURLTableModel() {
   template_url_service_->RemoveObserver(this);
-  base::STLDeleteElements(&entries_);
 }
 
 void TemplateURLTableModel::Reload() {
-  base::STLDeleteElements(&entries_);
+  entries_.clear();
 
   TemplateURLService::TemplateURLVector urls =
       template_url_service_->GetTemplateURLs();
 
-  std::vector<ModelEntry*> default_entries, other_entries, extension_entries;
+  std::vector<std::unique_ptr<ModelEntry>> default_entries, other_entries,
+      extension_entries;
   // Keywords that can be made the default first.
-  for (TemplateURLService::TemplateURLVector::iterator i = urls.begin();
-       i != urls.end(); ++i) {
+  for (auto i = urls.begin(); i != urls.end(); ++i) {

[Nico, 2016/10/24 18:41:02]

nit: foreach

[Avi (use Gerrit), 2016/10/24 19:15:37]

Done.

     TemplateURL* template_url = *i;
     // NOTE: we don't use ShowInDefaultList here to avoid items bouncing around
     // the lists while editing.
     if (template_url->show_in_default_list())
-      default_entries.push_back(new ModelEntry(this, template_url));
+      default_entries.push_back(
+          base::MakeUnique<ModelEntry>(this, template_url));
     else if (template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION)
-      extension_entries.push_back(new ModelEntry(this, template_url));
+      extension_entries.push_back(
+          base::MakeUnique<ModelEntry>(this, template_url));
     else
-      other_entries.push_back(new ModelEntry(this, template_url));
+      other_entries.push_back(base::MakeUnique<ModelEntry>(this, template_url));
   }
 
   last_search_engine_index_ = static_cast<int>(default_entries.size());
   last_other_engine_index_ = last_search_engine_index_ +
       static_cast<int>(other_entries.size());
 
-  entries_.insert(entries_.end(),
-                  default_entries.begin(),
-                  default_entries.end());
+  std::move(default_entries.begin(), default_entries.end(),
+            std::back_inserter(entries_));
 
-  entries_.insert(entries_.end(),
-                  other_entries.begin(),
-                  other_entries.end());
+  std::move(other_entries.begin(), other_entries.end(),
+            std::back_inserter(entries_));
 
-  entries_.insert(entries_.end(),
-                  extension_entries.begin(),
-                  extension_entries.end());
+  std::move(extension_entries.begin(), extension_entries.end(),
+            std::back_inserter(entries_));
 
   if (observer_)
     observer_->OnModelChanged();
 }
 
 int TemplateURLTableModel::RowCount() {
   return static_cast<int>(entries_.size());
 }
 
 base::string16 TemplateURLTableModel::GetText(int row, int col_id) {
@@ skipping 115 matching lines @@
 
   NotifyChanged(index);
 }
 
 TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) {
   return entries_[index]->template_url();
 }
 
 int TemplateURLTableModel::IndexOfTemplateURL(
     const TemplateURL* template_url) {
-  for (std::vector<ModelEntry*>::iterator i = entries_.begin();
-       i != entries_.end(); ++i) {
-    ModelEntry* entry = *i;
+  for (auto i = entries_.begin(); i != entries_.end(); ++i) {

[Nico, 2016/10/24 18:41:02]

nit: foreach?

[Avi (use Gerrit), 2016/10/24 19:15:37]

No, we need i on line 309.

+    ModelEntry* entry = i->get();
     if (entry->template_url() == template_url)
       return static_cast<int>(i - entries_.begin());
   }
   return -1;
 }
 
 int TemplateURLTableModel::MoveToMainGroup(int index) {
   if (index < last_search_engine_index_)
     return index;  // Already in the main group.
 
@@ skipping 36 matching lines @@
 }
 
 void TemplateURLTableModel::NotifyChanged(int index) {
   if (observer_) {
     DCHECK_GE(index, 0);
     observer_->OnItemsChanged(index, 1);
   }
 }
 
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
-  std::vector<ModelEntry*>::iterator i =
-      std::find(entries_.begin(), entries_.end(), entry);
+  auto i = std::find_if(entries_.begin(), entries_.end(),
+                        [entry](const std::unique_ptr<ModelEntry>& ptr) {
+                          return ptr.get() == entry;
+                        });
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }
 
 std::unique_ptr<TemplateURLTableModel::ModelEntry>
 TemplateURLTableModel::RemoveEntry(int index) {
-  std::unique_ptr<ModelEntry> entry(entries_[index]);
+  std::unique_ptr<ModelEntry> entry = std::move(entries_[index]);
   entries_.erase(index + entries_.begin());
   if (index < last_search_engine_index_)
     --last_search_engine_index_;
   if (index < last_other_engine_index_)
     --last_other_engine_index_;
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
   return entry;
 }
 
 void TemplateURLTableModel::AddEntry(int index,
                                      std::unique_ptr<ModelEntry> entry) {
-  entries_.insert(entries_.begin() + index, entry.release());
+  entries_.insert(entries_.begin() + index, std::move(entry));
   if (index <= last_other_engine_index_)
     ++last_other_engine_index_;
   if (observer_)
     observer_->OnItemsAdded(index, 1);
 }