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

ui/views/accessibility/ax_aura_obj_cache.cc

Index: ui/views/accessibility/ax_aura_obj_cache.cc
diff --git a/ui/views/accessibility/ax_aura_obj_cache.cc b/ui/views/accessibility/ax_aura_obj_cache.cc
index 47964bee739a40487fc24c7fc673fcfd6ad6ac15..3d4850e0bc26a827e2b7090a7f1bc941c679716e 100644
--- a/ui/views/accessibility/ax_aura_obj_cache.cc
+++ b/ui/views/accessibility/ax_aura_obj_cache.cc
@@ -33,15 +33,15 @@
   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_);
 }
 
@@ -129,11 +129,13 @@
 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;