Revert of Revert of Migrate accessibility from RenderView to RenderFrame.

content/test/accessibility_browser_test_utils.h

Index: content/test/accessibility_browser_test_utils.h
diff --git a/content/test/accessibility_browser_test_utils.h b/content/test/accessibility_browser_test_utils.h
index 5111e3c6132877a084be07265c026d6c90845a7a..2e22b6f9ef94981eb443ea1682e71a309b5dd39d 100644
--- a/content/test/accessibility_browser_test_utils.h
+++ b/content/test/accessibility_browser_test_utils.h
@@ -6,14 +6,14 @@
 #define CONTENT_TEST_ACCESSIBILITY_BROWSER_TEST_UTILS_H_
 
 #include "base/memory/weak_ptr.h"
-#include "content/common/view_message_enums.h"
+#include "content/common/accessibility_mode_enums.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_tree.h"
 
 namespace content {
 
 class MessageLoopRunner;
-class RenderViewHostImpl;
+class RenderFrameHostImpl;
 class Shell;
 
 // Create an instance of this class *before* doing any operation that
@@ -53,7 +53,7 @@
   bool IsAboutBlank();
 
   Shell* shell_;
-  RenderViewHostImpl* view_host_;
+  RenderFrameHostImpl* frame_host_;
   ui::AXEvent event_to_wait_for_;
   scoped_refptr<MessageLoopRunner> loop_runner_;
   base::WeakPtrFactory<AccessibilityNotificationWaiter> weak_factory_;