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

ui/views/controls/menu/native_menu_win.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 "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"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/views/controls/menu/menu_insertion_delegate_win.h"
 
 namespace views {
 
 struct NativeMenuWin::ItemData {
@@ skipping 19 matching lines @@
   mi.fMask = MIM_MENUDATA | MIM_STYLE;
   GetMenuInfo(hmenu, &mi);
   return reinterpret_cast<NativeMenuWin*>(mi.dwMenuData);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, public:
 
 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_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, MenuWrapper implementation:
 
 void NativeMenuWin::Rebuild(MenuInsertionDelegateWin* delegate) {
   ResetNativeMenu();
   items_.clear();
 
   owner_draw_ = model_->HasIcons() || owner_draw_;
   first_item_index_ = delegate ? delegate->GetInsertionIndex(menu_) : 0;
   for (int menu_index = first_item_index_;
         menu_index < first_item_index_ + model_->GetItemCount(); ++menu_index) {
     int model_index = menu_index - first_item_index_;
     if (model_->GetTypeAt(model_index) == ui::MenuModel::TYPE_SEPARATOR)
       AddSeparatorItemAt(menu_index, model_index);
     else
       AddMenuItemAt(menu_index, model_index);
   }
 }
 
 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);
     if (model_->IsItemDynamicAt(model_index)) {
       // TODO(atwilson): Update the icon as well (http://crbug.com/66508).
       SetMenuItemLabel(menu_index, model_index,
                        model_->GetLabelAt(model_index));
     }
     NativeMenuWin* submenu = (*it)->submenu.get();
     if (submenu)
@@ skipping 14 matching lines @@
 
 void NativeMenuWin::AddMenuItemAt(int menu_index, int model_index) {
   MENUITEMINFO mii = {0};
   mii.cbSize = sizeof(mii);
   mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_DATA;
   if (!owner_draw_)
     mii.fType = MFT_STRING;
   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_;
     GetNativeMenuWinFromHMENU(mii.hSubMenu)->parent_ = this;
   } else {
     if (type == ui::MenuModel::TYPE_RADIO)
       mii.fType |= MFT_RADIOCHECK;
     mii.wID = model_->GetCommandIdAt(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);
 }
 
 void NativeMenuWin::AddSeparatorItemAt(int menu_index, int model_index) {
   MENUITEMINFO mii = {0};
   mii.cbSize = sizeof(mii);
   mii.fMask = MIIM_FTYPE;
   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);
 }
 
 void NativeMenuWin::SetMenuItemState(int menu_index, bool enabled, bool checked,
                                      bool is_default) {
   if (IsSeparatorItemAt(menu_index))
     return;
 
   UINT state = enabled ? MFS_ENABLED : MFS_DISABLED;
   if (checked)
@@ skipping 62 matching lines @@
     MENUINFO mi = {0};
     mi.cbSize = sizeof(mi);
     mi.fMask = MIM_STYLE | MIM_MENUDATA;
     mi.dwStyle = MNS_NOTIFYBYPOS;
     mi.dwMenuData = reinterpret_cast<ULONG_PTR>(this);
     SetMenuInfo(menu_, &mi);
   }
 }
 
 }  // namespace views