Revert of Reset accessibility if it gets out of sync.

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 2b03ccadb331b53ab2597440b1c56061e5b7995f..a848238ef6e77643bdb75c0b590355b7de1276a0 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -88,11 +88,6 @@
   // number of active frames of a SiteInstance or not.
   static bool IsRFHStateActive(RenderFrameHostImplState rfh_state);
 
-  // An accessibility reset is only allowed to prevent very rare corner cases
-  // or race conditions where the browser and renderer get out of sync. If
-  // this happens more than this many times, kill the renderer.
-  static const int kMaxAccessibilityResets = 5;
-
   static RenderFrameHostImpl* FromID(int process_id, int routing_id);
 
   virtual ~RenderFrameHostImpl();
@@ -336,10 +331,6 @@
   // this frame, or create one if it doesn't exist yet, otherwise return
   // NULL.
   BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager();
-
-  void set_disallow_browser_accessibility_manager_for_testing(bool flag) {
-    disallow_browser_accessibility_manager_for_testing_ = flag;
-  }
 
 #if defined(OS_WIN)
   void SetParentNativeViewAccessible(
@@ -432,8 +423,7 @@
   void OnBeginNavigation(const FrameHostMsg_BeginNavigation_Params& params,
                          const CommonNavigationParams& common_params);
   void OnAccessibilityEvents(
-      const std::vector<AccessibilityHostMsg_EventParams>& params,
-      int reset_token);
+      const std::vector<AccessibilityHostMsg_EventParams>& params);
   void OnAccessibilityLocationChanges(
       const std::vector<AccessibilityHostMsg_LocationChangeParams>& params);
 
@@ -557,24 +547,12 @@
 
   ServiceRegistryImpl service_registry_;
 
-  // The object managing the accessibility tree for this frame.
   scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;
-
-  // This is nonzero if we sent an accessibility reset to the renderer and
-  // we're waiting for an IPC containing this reset token (sequentially
-  // assigned) and a complete replacement accessibility tree.
-  int accessibility_reset_token_;
-
-  // A count of the number of times we needed to reset accessibility, so
-  // we don't keep trying to reset forever.
-  int accessibility_reset_count_;
 
   // Callback when an event is received, for testing.
   base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_;
   // The most recently received accessibility tree - for testing only.
   scoped_ptr<ui::AXTree> ax_tree_for_testing_;
-  // Flag to not create a BrowserAccessibilityManager, for testing.
-  bool disallow_browser_accessibility_manager_for_testing_;
 
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;