Remove stl_util's deletion function use from ui/views/.

BUG=555865

Review-Url: https://codereview.chromium.org/2445513002
Cr-Commit-Position: refs/heads/master@{#427084}

ui/views/controls/menu/menu_item_view.cc

@@ -8,7 +8,6 @@
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -525,7 +524,9 @@ void MenuItemView::ChildrenChanged() {
     }
   }
 
-  base::STLDeleteElements(&removed_items_);
+  for (auto item : removed_items_)
+    delete item;
+  removed_items_.clear();
 }
 
 void MenuItemView::Layout() {
@@ -598,7 +599,8 @@ MenuItemView::MenuItemView(MenuItemView* parent,
 
 MenuItemView::~MenuItemView() {
   delete submenu_;
-  base::STLDeleteElements(&removed_items_);
+  for (auto item : removed_items_)
+    delete item;
 }
 
 const char* MenuItemView::GetClassName() const {

ui/views/controls/menu/native_menu_win.cc

@@ -5,7 +5,7 @@
 #include "ui/views/controls/menu/native_menu_win.h"
 
 #include "base/logging.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -45,19 +45,18 @@ static NativeMenuWin* GetNativeMenuWinFromHMENU(HMENU hmenu) {
 
 NativeMenuWin::NativeMenuWin(ui::MenuModel* model, HWND system_menu_for)
     : model_(model),
-      menu_(NULL),
-      owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL) &&
+      menu_(nullptr),
+      owner_draw_(l10n_util::NeedOverrideDefaultUIFont(nullptr, nullptr) &&
                   !system_menu_for),
       system_menu_for_(system_menu_for),
       first_item_index_(0),
-      parent_(NULL),
-      destroyed_flag_(NULL) {
-}
+      parent_(nullptr),
+      destroyed_flag_(nullptr) {}
 
 NativeMenuWin::~NativeMenuWin() {
   if (destroyed_flag_)
     *destroyed_flag_ = true;
-  base::STLDeleteContainerPointers(items_.begin(), items_.end());
+  items_.clear();
   DestroyMenu(menu_);
 }
 
@@ -84,7 +83,7 @@ void NativeMenuWin::UpdateStates() {
   // A depth-first walk of the menu items, updating states.
   int model_index = 0;
   std::vector<ItemData*>::const_iterator it;
-  for (it = items_.begin(); it != items_.end(); ++it, ++model_index) {
+  for (auto it = items_.begin(); it != items_.end(); ++it, ++model_index) {
     int menu_index = model_index + first_item_index_;
     SetMenuItemState(menu_index, model_->IsEnabledAt(model_index),
                      model_->IsItemCheckedAt(model_index), false);
@@ -119,12 +118,12 @@ void NativeMenuWin::AddMenuItemAt(int menu_index, int model_index) {
   else
     mii.fType = MFT_OWNERDRAW;
 
-  ItemData* item_data = new ItemData;
+  std::unique_ptr<ItemData> item_data = base::MakeUnique<ItemData>();
   item_data->label = base::string16();
   ui::MenuModel::ItemType type = model_->GetTypeAt(model_index);
   if (type == ui::MenuModel::TYPE_SUBMENU) {
-    item_data->submenu.reset(
-        new NativeMenuWin(model_->GetSubmenuModelAt(model_index), nullptr));
+    item_data->submenu = base::MakeUnique<NativeMenuWin>(
+        model_->GetSubmenuModelAt(model_index), nullptr);
     item_data->submenu->Rebuild(nullptr);
     mii.fMask |= MIIM_SUBMENU;
     mii.hSubMenu = item_data->submenu->menu_;
@@ -136,8 +135,8 @@ void NativeMenuWin::AddMenuItemAt(int menu_index, int model_index) {
   }
   item_data->native_menu_win = this;
   item_data->model_index = model_index;
-  items_.insert(items_.begin() + model_index, item_data);
-  mii.dwItemData = reinterpret_cast<ULONG_PTR>(item_data);
+  mii.dwItemData = reinterpret_cast<ULONG_PTR>(item_data.get());
+  items_.insert(items_.begin() + model_index, std::move(item_data));
   UpdateMenuItemInfoForString(&mii, model_index,
                               model_->GetLabelAt(model_index));
   InsertMenuItem(menu_, menu_index, TRUE, &mii);
@@ -150,7 +149,7 @@ void NativeMenuWin::AddSeparatorItemAt(int menu_index, int model_index) {
   mii.fType = MFT_SEPARATOR;
   // Insert a dummy entry into our label list so we can index directly into it
   // using item indices if need be.
-  items_.insert(items_.begin() + model_index, new ItemData);
+  items_.insert(items_.begin() + model_index, base::MakeUnique<ItemData>());
   InsertMenuItem(menu_, menu_index, TRUE, &mii);
 }
 

ui/views/controls/menu/native_menu_win.h

@@ -5,6 +5,7 @@
 #ifndef UI_VIEWS_CONTROLS_MENU_NATIVE_MENU_WIN_H_
 #define UI_VIEWS_CONTROLS_MENU_NATIVE_MENU_WIN_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/macros.h"
@@ -87,7 +88,7 @@ class VIEWS_EXPORT NativeMenuWin {
   // An object that collects all of the data associated with an individual menu
   // item.
   struct ItemData;
-  std::vector<ItemData*> items_;
+  std::vector<std::unique_ptr<ItemData>> items_;
 
   // The HWND this menu is the system menu for, or NULL if the menu is not a
   // system menu.

ui/views/layout/grid_layout.h

@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include <memory>
 #include <vector>
 
 #include "base/macros.h"
@@ -197,11 +198,11 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
 
   // This is called internally from AddView. It adds the ViewState to the
   // appropriate structures, and updates internal fields such as next_column_.
-  void AddViewState(ViewState* view_state);
+  void AddViewState(std::unique_ptr<ViewState> view_state);
 
   // Adds the Row to rows_, as well as updating next_column_,
   // current_row_col_set ...
-  void AddRow(Row* row);
+  void AddRow(std::unique_ptr<Row> row);
 
   // As the name says, updates the remaining_height of the ViewState for
   // all Rows the supplied ViewState touches.
@@ -244,13 +245,13 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
   bool adding_view_;
 
   // ViewStates. This is ordered by row_span in ascending order.
-  mutable std::vector<ViewState*> view_states_;
+  mutable std::vector<std::unique_ptr<ViewState>> view_states_;
 
   // ColumnSets.
-  mutable std::vector<ColumnSet*> column_sets_;
+  mutable std::vector<std::unique_ptr<ColumnSet>> column_sets_;
 
   // Rows.
-  mutable std::vector<Row*> rows_;
+  mutable std::vector<std::unique_ptr<Row>> rows_;
 
   // Minimum preferred size.
   gfx::Size minimum_size_;
@@ -347,14 +348,14 @@ class VIEWS_EXPORT ColumnSet {
   // as updating the remaining_width.
   void CalculateSize();
 
-  // Distributes delta amoung the resizable columns.
+  // Distributes delta among the resizable columns.
   void Resize(int delta);
 
   // ID for this columnset.
   const int id_;
 
   // The columns.
-  std::vector<Column*> columns_;
+  std::vector<std::unique_ptr<Column>> columns_;
 
   // The ViewStates. This is sorted based on column_span in ascending
   // order.