Revert of Revert of Migrate accessibility from RenderView to RenderFrame.

chrome/browser/extensions/api/automation/automation_apitest.cc

 // 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.
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 57 matching lines @@
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, TestRendererAccessibilityEnabled) {
   LoadPage();
 
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   content::WebContents* const tab =
       browser()->tab_strip_model()->GetWebContentsAt(0);
-  content::RenderWidgetHost* rwh =
-      tab->GetRenderWidgetHostView()->GetRenderWidgetHost();
-  ASSERT_NE((content::RenderWidgetHost*)NULL, rwh)
-      << "Couldn't get RenderWidgetHost";
-  ASSERT_FALSE(rwh->IsFullAccessibilityModeForTesting());
-  ASSERT_FALSE(rwh->IsTreeOnlyAccessibilityModeForTesting());
+  ASSERT_FALSE(tab->IsFullAccessibilityModeForTesting());
+  ASSERT_FALSE(tab->IsTreeOnlyAccessibilityModeForTesting());
 
   base::FilePath extension_path =
       test_data_dir_.AppendASCII("automation/tests/basic");
   ExtensionTestMessageListener got_tree(kGotTree, false /* no reply */);
   LoadExtension(extension_path);
   ASSERT_TRUE(got_tree.WaitUntilSatisfied());
 
-  rwh = tab->GetRenderWidgetHostView()->GetRenderWidgetHost();
-  ASSERT_NE((content::RenderWidgetHost*)NULL, rwh)
-      << "Couldn't get RenderWidgetHost";
-  ASSERT_FALSE(rwh->IsFullAccessibilityModeForTesting());
-  ASSERT_TRUE(rwh->IsTreeOnlyAccessibilityModeForTesting());
+  ASSERT_FALSE(tab->IsFullAccessibilityModeForTesting());
+  ASSERT_TRUE(tab->IsTreeOnlyAccessibilityModeForTesting());
 }
 
 #if defined(ADDRESS_SANITIZER)
 #define Maybe_SanityCheck DISABLED_SanityCheck
 #else
 #define Maybe_SanityCheck SanityCheck
 #endif
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Maybe_SanityCheck) {
   StartEmbeddedTestServer();
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "sanity_check.html"))
@@ skipping 422 matching lines @@
       "automationInternal.enableTab",
       FakeAutomationInternalEnableTabFunctionFactory));
   ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
       "automationInternal.performAction",
       FakeAutomationInternalPerformActionFunctionFactory));
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated",
                                   "generated_trees.html")) << message_;
 }
 
 }  // namespace extensions