Revert "content: convert accessibility notifications to callbacks"

content/browser/renderer_host/render_view_host_impl.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 396 matching lines @@
   // Set the opener to null in the renderer process.
   void DisownOpener();
 
   // Updates the frame tree for this RVH and sends an IPC down to the renderer
   // process to keep them in sync. For more details, see the comments on
   // ViewHostMsg_FrameTreeUpdated.
   void UpdateFrameTree(int process_id,
                        int route_id,
                        const std::string& frame_tree);
 
-  // Set accessibility callbacks.
-  void SetAccessibilityLayoutCompleteCallbackForTesting(
-      const base::Closure& callback);
-  void SetAccessibilityLoadCompleteCallbackForTesting(
-      const base::Closure& callback);
-
   void set_save_accessibility_tree_for_testing(bool save) {
     save_accessibility_tree_for_testing_ = save;
   }
 
   const AccessibilityNodeData& accessibility_tree_for_testing() {
     return accessibility_tree_;
   }
 
   bool is_waiting_for_unload_ack_for_testing() {
     return is_waiting_for_unload_ack_;
@@ skipping 218 matching lines @@
   // the case of a cross-site transition ( = true).
   bool unload_ack_is_for_cross_site_transition_;
 
   bool are_javascript_messages_suppressed_;
 
   // The mapping of pending javascript calls created by
   // ExecuteJavascriptInWebFrameCallbackResult and their corresponding
   // callbacks.
   std::map<int, JavascriptResultCallback> javascript_callbacks_;
 
-  // Accessibility callbacks.
-  base::Closure accessibility_layout_callback_;
-  base::Closure accessibility_load_callback_;
-
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
   // The session storage namespace to be used by the associated render view.
   scoped_refptr<SessionStorageNamespaceImpl> session_storage_namespace_;
 
   // Whether the accessibility tree should be saved, for unit testing.
   bool save_accessibility_tree_for_testing_;
 
   // A JSON serialized representation of the frame tree for the current document
@@ skipping 27 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_