Remove stl_util's STLDeleteContainerPairSecondPointers from ui/.

ui/views/accessibility/ax_aura_obj_cache.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/views/accessibility/ax_aura_obj_cache.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
-#include "base/stl_util.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
 #include "ui/views/accessibility/ax_view_obj_wrapper.h"
 #include "ui/views/accessibility/ax_widget_obj_wrapper.h"
 #include "ui/views/accessibility/ax_window_obj_wrapper.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
@@ skipping 57 matching lines @@
 
 void AXAuraObjCache::Remove(aura::Window* window, aura::Window* parent) {
   int id = GetIDInternal(parent, window_to_id_map_);
   AXAuraObjWrapper* parent_window_obj = Get(id);
   RemoveInternal(window, window_to_id_map_);
   if (parent && delegate_)
     delegate_->OnChildWindowRemoved(parent_window_obj);
 }
 
 AXAuraObjWrapper* AXAuraObjCache::Get(int32_t id) {
-  std::map<int32_t, AXAuraObjWrapper*>::iterator it = cache_.find(id);
+  auto it = cache_.find(id);
 
   if (it == cache_.end())
-    return NULL;
+    return nullptr;
 
-  return it->second;
+  return it->second.get();
 }
 
 void AXAuraObjCache::Remove(int32_t id) {
   AXAuraObjWrapper* obj = Get(id);
 
   if (id == -1 || !obj)
     return;
 
   cache_.erase(id);
-  delete obj;
 }
 
 void AXAuraObjCache::GetTopLevelWindows(
     std::vector<AXAuraObjWrapper*>* children) {
-  for (std::map<aura::Window*, int32_t>::iterator it =
-           window_to_id_map_.begin();
-       it != window_to_id_map_.end(); ++it) {
+  for (auto it = window_to_id_map_.begin(); it != window_to_id_map_.end();
+       ++it) {
     if (!it->first->parent())
       children->push_back(GetOrCreate(it->first));
   }
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetFocus() {
   View* focused_view = GetFocusedView();
   if (focused_view)
     return GetOrCreate(focused_view);
   return nullptr;
 }
 
 AXAuraObjCache::AXAuraObjCache()
     : current_id_(1),
       focus_client_(nullptr),
       is_destroying_(false),
       delegate_(nullptr) {}
 
 AXAuraObjCache::~AXAuraObjCache() {
   is_destroying_ = true;
-  base::STLDeleteContainerPairSecondPointers(cache_.begin(), cache_.end());
   cache_.clear();
 }
 
 View* AXAuraObjCache::GetFocusedView() {
   if (!focus_client_)
     return nullptr;
 
   aura::Window* focused_window = focus_client_->GetFocusedWindow();
   if (!focused_window)
     return nullptr;
@@ skipping 26 matching lines @@
 
 void AXAuraObjCache::OnWindowDestroying(aura::Window* window) {
   focus_client_ = nullptr;
 }
 
 template <typename AuraViewWrapper, typename AuraView>
 AXAuraObjWrapper* AXAuraObjCache::CreateInternal(
     AuraView* aura_view,
     std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   if (!aura_view)
-    return NULL;
+    return nullptr;
 
-  typename std::map<AuraView*, int32_t>::iterator it =
-      aura_view_to_id_map.find(aura_view);
+  auto it = aura_view_to_id_map.find(aura_view);
 
   if (it != aura_view_to_id_map.end())
     return Get(it->second);
 
   AXAuraObjWrapper* wrapper = new AuraViewWrapper(aura_view);
   aura_view_to_id_map[aura_view] = current_id_;
-  cache_[current_id_] = wrapper;
+  cache_[current_id_] = base::WrapUnique(wrapper);
   current_id_++;
   return wrapper;
 }
 
 template <typename AuraView>
 int32_t AXAuraObjCache::GetIDInternal(
     AuraView* aura_view,
     const std::map<AuraView*, int32_t>& aura_view_to_id_map) const {
   if (!aura_view)
     return -1;
@@ skipping 10 matching lines @@
     AuraView* aura_view,
     std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   int32_t id = GetID(aura_view);
   if (id == -1)
     return;
   aura_view_to_id_map.erase(aura_view);
   Remove(id);
 }
 
 }  // namespace views