Revert of Remove all descendant views from AXAuraObjCache when a view is removed.

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/singleton.h"
 #include "base/stl_util.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
@@ skipping 15 matching lines @@
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(Widget* widget) {
   return CreateInternal<AXWidgetObjWrapper>(widget, widget_to_id_map_);
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(aura::Window* window) {
   return CreateInternal<AXWindowObjWrapper>(window, window_to_id_map_);
 }
 
-int32_t AXAuraObjCache::GetID(View* view) const {
+int32_t AXAuraObjCache::GetID(View* view) {
   return GetIDInternal(view, view_to_id_map_);
 }
 
-int32_t AXAuraObjCache::GetID(Widget* widget) const {
+int32_t AXAuraObjCache::GetID(Widget* widget) {
   return GetIDInternal(widget, widget_to_id_map_);
 }
 
-int32_t AXAuraObjCache::GetID(aura::Window* window) const {
+int32_t AXAuraObjCache::GetID(aura::Window* window) {
   return GetIDInternal(window, window_to_id_map_);
 }
 
 void AXAuraObjCache::Remove(View* view) {
   RemoveInternal(view, view_to_id_map_);
 }
 
 void AXAuraObjCache::RemoveViewSubtree(View* view) {
   Remove(view);
   for (int i = 0; i < view->child_count(); ++i)
@@ skipping 67 matching lines @@
   AXAuraObjWrapper* wrapper = new AuraViewWrapper(aura_view);
   aura_view_to_id_map[aura_view] = current_id_;
   cache_[current_id_] = 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 {
+    std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   if (!aura_view)
     return -1;
 
-  auto it = aura_view_to_id_map.find(aura_view);
+  typename std::map<AuraView*, int32_t>::iterator it =
+      aura_view_to_id_map.find(aura_view);
+
   if (it != aura_view_to_id_map.end())
     return it->second;
 
   return -1;
 }
 
 template <typename AuraView>
 void AXAuraObjCache::RemoveInternal(
     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