Migrate accessibility from RenderView to RenderFrame.

chrome/browser/extensions/api/automation_internal/automation_internal_api.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 "chrome/browser/extensions/api/automation_internal/automation_internal_api.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #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"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/accessibility/automation_manager_views.h"
 #endif
 
 namespace extensions {
 class AutomationWebContentsObserver;
@@ skipping 52 matching lines @@
   if (!rwh)
     return false;
 
   results_ = api::automation_internal::EnableCurrentTab::Results::Create(
       rwh->GetProcess()->GetID(), rwh->GetRoutingID());
 
   SendResponse(true);
 
   AutomationWebContentsObserver::CreateForWebContents(contents);
 
-  rwh->EnableTreeOnlyAccessibilityMode();
+  contents->EnableTreeOnlyAccessibilityMode();
 
   return true;
 }
 
 bool AutomationInternalPerformActionFunction::RunAsync() {
   using api::automation_internal::PerformAction::Params;
   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: {
       extensions::api::automation_internal::SetSelectionParams selection_params;
       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;
     }
     default:
       NOTREACHED();
   }
   return true;
 }
 
 bool AutomationInternalEnableDesktopFunction::RunAsync() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableAutomationAPI)) {
     return false;
   }
 
 #if defined(OS_CHROMEOS)
   AutomationManagerViews::GetInstance()->Enable(browser_context());
 #else
   error_ = "getDesktop is unsupported by this platform";
 #endif
 
   return true;
 }
 
 }  // namespace extensions