Keep track of accessibility focus across windows.

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 379ec41e3ee37562b7cb326aa0b2ad5c6531b78a..19641d8634ff4648f0154041677aab6b55c75d26 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -159,6 +159,29 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, Desktop) {
       << message_;
 }
 
+IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopInitialFocus) {
+  ASSERT_TRUE(
+      RunExtensionSubtest("automation/tests/desktop", "initial_focus.html"))
+      << message_;
+}
+
+IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) {

[David Tseng, 2016/01/28 02:00:56]

Should this work on all platforms?

[dmazzoni, 2016/01/30 00:02:41]

Yes, this should work on all Aura platforms.

+  ASSERT_TRUE(
+      RunExtensionSubtest("automation/tests/desktop", "focus_web.html"))
+      << message_;
+}
+
+IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) {
+  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", "focus_views.html"))
+      << message_;
+}
+
 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotRequested) {
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs",
                                   "desktop_not_requested.html")) << message_;