Enable chrome.automation.getDesktop on all aura platforms.

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

Index: chrome/browser/extensions/api/automation/automation_apitest.cc
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index b5e2dd302191f0022b58d5f543ad1e67c7ee9ce1..381a749074d0ec2a5b5088540bcc7d3892b012f1 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -27,6 +27,12 @@
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/accessibility/tree_generator.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/shell.h"
+#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
+#endif
+
 namespace extensions {
 
 namespace {
@@ -140,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, TabsAutomationHostsPermissions) {
       << message_;
 }
 
-#if defined(OS_CHROMEOS)
+#if defined(USE_AURA)
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Desktop) {
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html"))
       << message_;
@@ -151,12 +157,18 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotRequested) {
                                   "desktop_not_requested.html")) << message_;
 }
 
+#if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) {
+  AutomationManagerAura::GetInstance()->Enable(browser()->profile());
+  // Trigger the shelf subtree to be computed.
+  ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(
+      ash::FOCUS_SHELF);
+
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html"))
       << message_;
 }
+#endif  // defined(OS_CHROMEOS)
 
-// http://crbug.com/435449
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopLoadTabs) {
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html"))
       << message_;
@@ -164,7 +176,8 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopLoadTabs) {
 #else
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) {
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop",
-                                  "desktop_not_supported.html")) << message_;
+                                  "desktop_not_supported.html"))
+      << message_;
 }
 #endif