Migrate accessibility from RenderView to RenderFrame.

chrome/browser/extensions/api/automation_internal/automation_internal_api.cc

Index: chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
index 88600550e2d72a13775321884fac5e24abfb61b0..a683dcdf52bda882a029bf5835c231c594706172 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
@@ -13,8 +13,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/automation_internal.h"
 #include "content/public/browser/ax_event_notification_details.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.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"
 #include "content/public/browser/web_contents.h"
@@ -83,7 +83,7 @@ bool AutomationInternalEnableCurrentTabFunction::RunAsync() {
 
   AutomationWebContentsObserver::CreateForWebContents(contents);
 
-  rwh->EnableTreeOnlyAccessibilityMode();
+  contents->EnableTreeOnlyAccessibilityMode();
 
   return true;
 }
@@ -93,19 +93,21 @@ bool AutomationInternalPerformActionFunction::RunAsync() {
   scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  content::RenderWidgetHost* rwh =
-      content::RenderWidgetHost::FromID(params->args.process_id,
-                                        params->args.routing_id);
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(params->args.process_id,
+                                       params->args.routing_id);
+  if (!rfh)
+    return false;
 
   switch (params->args.action_type) {
     case api::automation_internal::ACTION_TYPE_DO_DEFAULT:
-      rwh->AccessibilityDoDefaultAction(params->args.automation_node_id);
+      rfh->AccessibilityDoDefaultAction(params->args.automation_node_id);
       break;
     case api::automation_internal::ACTION_TYPE_FOCUS:
-      rwh->AccessibilitySetFocus(params->args.automation_node_id);
+      rfh->AccessibilitySetFocus(params->args.automation_node_id);
       break;
     case api::automation_internal::ACTION_TYPE_MAKE_VISIBLE:
-      rwh->AccessibilityScrollToMakeVisible(params->args.automation_node_id,
+      rfh->AccessibilityScrollToMakeVisible(params->args.automation_node_id,
                                             gfx::Rect());
       break;
     case api::automation_internal::ACTION_TYPE_SET_SELECTION: {
@@ -113,7 +115,7 @@ bool AutomationInternalPerformActionFunction::RunAsync() {
       EXTENSION_FUNCTION_VALIDATE(
           extensions::api::automation_internal::SetSelectionParams::Populate(
               params->opt_args.additional_properties, &selection_params));
-      rwh->AccessibilitySetTextSelection(params->args.automation_node_id,
+      rfh->AccessibilitySetTextSelection(params->args.automation_node_id,
                                          selection_params.start_index,
                                          selection_params.end_index);
       break;