Remove stl_util's deletion function use from ui/.

ui/chromeos/ime/candidate_window_view.cc

 // Copyright 2014 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 "ui/chromeos/ime/candidate_window_view.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/chromeos/ime/candidate_view.h"
 #include "ui/chromeos/ime/candidate_window_constants.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
@@ skipping 251 matching lines @@
 
     // Update the candidates in the current page.
     const size_t start_from =
         current_page_index * new_candidate_window.page_size();
 
     int max_shortcut_width = 0;
     int max_candidate_width = 0;
     for (size_t i = 0; i < candidate_views_.size(); ++i) {
       const size_t index_in_page = i;
       const size_t candidate_index = start_from + index_in_page;
-      CandidateView* candidate_view = candidate_views_[index_in_page];
+      CandidateView* candidate_view = candidate_views_[index_in_page].get();
       // Set the candidate text.
       if (candidate_index < new_candidate_window.candidates().size()) {
         const ui::CandidateWindow::Entry& entry =
             new_candidate_window.candidates()[candidate_index];
         candidate_view->SetEntry(entry);
         candidate_view->SetEnabled(true);
         candidate_view->SetInfolistIcon(!entry.description_title.empty());
       } else {
         // Disable the empty row.
         candidate_view->SetEntry(ui::CandidateWindow::Entry());
         candidate_view->SetEnabled(false);
         candidate_view->SetInfolistIcon(false);
       }
       if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
         int shortcut_width = 0;
         int candidate_width = 0;
         candidate_views_[i]->GetPreferredWidths(
             &shortcut_width, &candidate_width);
         max_shortcut_width = std::max(max_shortcut_width, shortcut_width);
         max_candidate_width = std::max(max_candidate_width, candidate_width);
       }
     }
     if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
-      for (size_t i = 0; i < candidate_views_.size(); ++i)
-        candidate_views_[i]->SetWidths(max_shortcut_width, max_candidate_width);
+      for (const auto& view : candidate_views_)
+        view->SetWidths(max_shortcut_width, max_candidate_width);
     }
 
     CandidateWindowBorder* border = static_cast<CandidateWindowBorder*>(
         GetBubbleFrameView()->bubble_border());
     if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL)
       border->set_offset(max_shortcut_width);
     else
       border->set_offset(0);
   }
   // Update the current candidate window. We'll use candidate_window_ from here.
@@ skipping 33 matching lines @@
 }
 
 void CandidateWindowView::MaybeInitializeCandidateViews(
     const ui::CandidateWindow& candidate_window) {
   const ui::CandidateWindow::Orientation orientation =
       candidate_window.orientation();
   const size_t page_size = candidate_window.page_size();
 
   // Reset all candidate_views_ when orientation changes.
   if (orientation != candidate_window_.orientation())
-    base::STLDeleteElements(&candidate_views_);
+    candidate_views_.clear();
 
-  while (page_size < candidate_views_.size()) {
-    delete candidate_views_.back();
+  while (page_size < candidate_views_.size())
     candidate_views_.pop_back();
-  }
+
   while (page_size > candidate_views_.size()) {
-    CandidateView* new_candidate = new CandidateView(this, orientation);
-    candidate_area_->AddChildView(new_candidate);
-    candidate_views_.push_back(new_candidate);
+    std::unique_ptr<CandidateView> new_candidate =
+        base::MakeUnique<CandidateView>(this, orientation);
+    candidate_area_->AddChildView(new_candidate.get());
+    candidate_views_.push_back(std::move(new_candidate));
   }
 }
 
 void CandidateWindowView::SelectCandidateAt(int index_in_page) {
   const int current_page_index = ComputePageIndex(candidate_window_);
   if (current_page_index < 0) {
     return;
   }
 
   const int cursor_absolute_index =
@@ skipping 19 matching lines @@
   return "CandidateWindowView";
 }
 
 int CandidateWindowView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 void CandidateWindowView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
-    if (sender == candidate_views_[i]) {
+    if (sender == candidate_views_[i].get()) {
       for (Observer& observer : observers_)
         observer.OnCandidateCommitted(i);
       return;
     }
   }
 }
 
 }  // namespace ime
 }  // namespace ui