Enable chrome.automation.getDesktop on all aura platforms.

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 296ce4689316fef8b12aba2a32c42ae78c3a55f1..1aafd1f184f21a28f991064c05308b59b5422cab 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/automation_internal.h"
@@ -30,10 +31,6 @@
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h"
-#endif
-
 namespace extensions {
 class AutomationWebContentsObserver;
 }  // namespace extensions
@@ -257,7 +254,6 @@ AutomationInternalEnableTabFunction::Run() {
 
 ExtensionFunction::ResponseAction AutomationInternalEnableFrameFunction::Run() {
 // TODO(dtseng): Limited to desktop tree for now pending out of proc iframes.
-#if defined(OS_CHROMEOS)
   using api::automation_internal::EnableFrame::Params;
 
   scoped_ptr<Params> params(Params::Create(*args_));
@@ -275,8 +271,6 @@ ExtensionFunction::ResponseAction AutomationInternalEnableFrameFunction::Run() {
   contents->EnableTreeOnlyAccessibilityMode();
 
   return RespondNow(NoArguments());
-#endif
-  return RespondNow(Error("enableFrame is only supported on Chrome OS"));
 }
 
 ExtensionFunction::ResponseAction
@@ -290,8 +284,8 @@ AutomationInternalPerformActionFunction::Run() {
 
   if (params->args.tree_id == kDesktopTreeID) {
 #if defined(OS_CHROMEOS)
-    return RouteActionToAdapter(
-        params.get(), AutomationManagerAsh::GetInstance());
+    return RouteActionToAdapter(params.get(),
+                                AutomationManagerAura::GetInstance());
 #else
     NOTREACHED();
     return RespondNow(Error("Unexpected action on desktop automation tree;"
@@ -349,16 +343,12 @@ AutomationInternalPerformActionFunction::RouteActionToAdapter(
 
 ExtensionFunction::ResponseAction
 AutomationInternalEnableDesktopFunction::Run() {
-#if defined(OS_CHROMEOS)
   const AutomationInfo* automation_info = AutomationInfo::Get(extension());
   if (!automation_info || !automation_info->desktop)
     return RespondNow(Error("desktop permission must be requested"));
 
-  AutomationManagerAsh::GetInstance()->Enable(browser_context());
+  AutomationManagerAura::GetInstance()->Enable(browser_context());
   return RespondNow(NoArguments());
-#else
-  return RespondNow(Error("getDesktop is unsupported by this platform"));
-#endif  // defined(OS_CHROMEOS)
 }
 
 // static