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 ebc7ac1293402cb5bd40a2d53350136c4114fb6c..3478e24dc1a2e38efa09da914f884f8b0bfd4657 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/extensions/api/automation_internal.h"
 #include "chrome/common/extensions/manifest_handlers/automation.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"
@@ -112,6 +112,7 @@ AutomationInternalEnableCurrentTabFunction::Run() {
   if (!rwh)
     return RespondNow(Error("Could not enable accessibility for active tab"));
   AutomationWebContentsObserver::CreateForWebContents(contents);
+  contents->EnableTreeOnlyAccessibilityMode();
   rwh->EnableTreeOnlyAccessibilityMode();
   return RespondNow(
       ArgumentList(api::automation_internal::EnableCurrentTab::Results::Create(
@@ -138,13 +139,14 @@ AutomationInternalPerformActionFunction::Run() {
                             " platform does not support desktop automation"));
 #endif  // defined(OS_CHROMEOS)
   }
-  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 (!rwh)
+  if (!rfh)
     return RespondNow(Error("Ignoring action on destroyed node"));
 
-  RenderWidgetHostActionAdapter adapter(rwh);
+  RenderWidgetHostActionAdapter adapter(rfh);
   return RouteActionToAdapter(params.get(), &adapter);
 }