Revert 284065 "Revert of Revert of Migrate accessibility from Re..."

trunk/src/content/browser/accessibility/accessibility_mode_browsertest.cc

Index: trunk/src/content/browser/accessibility/accessibility_mode_browsertest.cc
===================================================================
--- trunk/src/content/browser/accessibility/accessibility_mode_browsertest.cc	(revision 284469)
+++ trunk/src/content/browser/accessibility/accessibility_mode_browsertest.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -24,20 +23,29 @@
 
 class AccessibilityModeTest : public ContentBrowserTest {
  protected:
-  WebContentsImpl* web_contents() {
-    return static_cast<WebContentsImpl*>(shell()->web_contents());
+  WebContents* web_contents() {
+    return shell()->web_contents();
   }
 
+  RenderWidgetHostImpl* rwhi() {
+    RenderWidgetHost* rwh =
+        web_contents()->GetRenderWidgetHostView()->GetRenderWidgetHost();
+    return RenderWidgetHostImpl::From(rwh);
+  }
+
+  RenderWidgetHostViewBase* host_view() {
+    return static_cast<RenderWidgetHostViewBase*>(
+        shell()->web_contents()->GetRenderWidgetHostView());
+  }
+
   void ExpectBrowserAccessibilityManager(bool expect_bam,
                                          std::string message = "") {
     if (expect_bam) {
-      EXPECT_NE(
-          (BrowserAccessibilityManager*)NULL,
-          web_contents()->GetRootBrowserAccessibilityManager()) << message;
+      EXPECT_NE((BrowserAccessibilityManager*)NULL,
+                host_view()->GetBrowserAccessibilityManager()) << message;
     } else {
-      EXPECT_EQ(
-          (BrowserAccessibilityManager*)NULL,
-          web_contents()->GetRootBrowserAccessibilityManager()) << message;
+      EXPECT_EQ((BrowserAccessibilityManager*)NULL,
+                host_view()->GetBrowserAccessibilityManager()) << message;
     }
   }
 };
@@ -45,17 +53,17 @@
 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeOff) {
   NavigateToURL(shell(), GURL(kMinimalPageDataURL));
 
-  EXPECT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode());
+  EXPECT_EQ(AccessibilityModeOff, rwhi()->accessibility_mode());
   ExpectBrowserAccessibilityManager(false);
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeComplete) {
   NavigateToURL(shell(), GURL(kMinimalPageDataURL));
-  ASSERT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode());
+  ASSERT_EQ(AccessibilityModeOff, rwhi()->accessibility_mode());
 
   AccessibilityNotificationWaiter waiter(shell());
-  web_contents()->AddAccessibilityMode(AccessibilityModeComplete);
-  EXPECT_EQ(AccessibilityModeComplete, web_contents()->GetAccessibilityMode());
+  rwhi()->AddAccessibilityMode(AccessibilityModeComplete);
+  EXPECT_EQ(AccessibilityModeComplete, rwhi()->accessibility_mode());
   waiter.WaitForNotification();
   ExpectBrowserAccessibilityManager(true);
 }
@@ -62,11 +70,11 @@
 
 IN_PROC_BROWSER_TEST_F(AccessibilityModeTest, AccessibilityModeTreeOnly) {
   NavigateToURL(shell(), GURL(kMinimalPageDataURL));
-  ASSERT_EQ(AccessibilityModeOff, web_contents()->GetAccessibilityMode());
+  ASSERT_EQ(AccessibilityModeOff, rwhi()->accessibility_mode());
 
   AccessibilityNotificationWaiter waiter(shell());
-  web_contents()->AddAccessibilityMode(AccessibilityModeTreeOnly);
-  EXPECT_EQ(AccessibilityModeTreeOnly, web_contents()->GetAccessibilityMode());
+  rwhi()->AddAccessibilityMode(AccessibilityModeTreeOnly);
+  EXPECT_EQ(AccessibilityModeTreeOnly, rwhi()->accessibility_mode());
   waiter.WaitForNotification();
   // No BrowserAccessibilityManager expected for AccessibilityModeTreeOnly
   ExpectBrowserAccessibilityManager(false);
@@ -76,8 +84,8 @@
   NavigateToURL(shell(), GURL(kMinimalPageDataURL));
 
   AccessibilityNotificationWaiter waiter(shell());
-  web_contents()->AddAccessibilityMode(AccessibilityModeTreeOnly);
-  EXPECT_EQ(AccessibilityModeTreeOnly, web_contents()->GetAccessibilityMode());
+  rwhi()->AddAccessibilityMode(AccessibilityModeTreeOnly);
+  EXPECT_EQ(AccessibilityModeTreeOnly, rwhi()->accessibility_mode());
   waiter.WaitForNotification();
   ExpectBrowserAccessibilityManager(false,
                                     "Should be no BrowserAccessibilityManager "
@@ -84,8 +92,8 @@
                                     "for AccessibilityModeTreeOnly");
 
   AccessibilityNotificationWaiter waiter2(shell());
-  web_contents()->AddAccessibilityMode(AccessibilityModeComplete);
-  EXPECT_EQ(AccessibilityModeComplete, web_contents()->GetAccessibilityMode());
+  rwhi()->AddAccessibilityMode(AccessibilityModeComplete);
+  EXPECT_EQ(AccessibilityModeComplete, rwhi()->accessibility_mode());
   waiter2.WaitForNotification();
   ExpectBrowserAccessibilityManager(true,
                                     "Should be a BrowserAccessibilityManager "