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

ui/views/accessibility/ax_aura_obj_cache.h

 // 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.
 
 #ifndef UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_
 #define UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 20 matching lines @@
  public:
   // Get the single instance of this class.
   static AXAuraObjCache* GetInstance();
 
   // Get or create an entry in the cache based on an Aura view.
   AXAuraObjWrapper* GetOrCreate(View* view);
   AXAuraObjWrapper* GetOrCreate(Widget* widget);
   AXAuraObjWrapper* GetOrCreate(aura::Window* window);
 
   // Gets an id given an Aura view.
-  int32_t GetID(View* view) const;
-  int32_t GetID(Widget* widget) const;
-  int32_t GetID(aura::Window* window) const;
+  int32_t GetID(View* view);
+  int32_t GetID(Widget* widget);
+  int32_t GetID(aura::Window* window);
 
   // Gets the next unique id for this cache. Useful for non-Aura view backed
   // views.
   int32_t GetNextID() { return current_id_++; }
 
   // Removes an entry from this cache based on an Aura view.
   void Remove(View* view);
   void Remove(Widget* widget);
   void Remove(aura::Window* window);
 
@@ skipping 17 matching lines @@
 
   AXAuraObjCache();
   virtual ~AXAuraObjCache();
 
   template <typename AuraViewWrapper, typename AuraView>
   AXAuraObjWrapper* CreateInternal(
       AuraView* aura_view,
       std::map<AuraView*, int32_t>& aura_view_to_id_map);
 
   template <typename AuraView>
-  int32_t GetIDInternal(
-      AuraView* aura_view,
-      const std::map<AuraView*, int32_t>& aura_view_to_id_map) const;
+  int32_t GetIDInternal(AuraView* aura_view,
+                        std::map<AuraView*, int32_t>& aura_view_to_id_map);
 
   template <typename AuraView>
   void RemoveInternal(AuraView* aura_view,
                       std::map<AuraView*, int32_t>& aura_view_to_id_map);
 
   std::map<views::View*, int32_t> view_to_id_map_;
   std::map<views::Widget*, int32_t> widget_to_id_map_;
   std::map<aura::Window*, int32_t> window_to_id_map_;
 
   std::map<int32_t, AXAuraObjWrapper*> cache_;
   int32_t current_id_;
 
   // True immediately when entering this object's destructor.
   bool is_destroying_;
 
   DISALLOW_COPY_AND_ASSIGN(AXAuraObjCache);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_