| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/location.h" | 6 #include "base/location.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 RunExtensionSubtest("automation/tests/desktop", "initial_focus.html")) | 165 RunExtensionSubtest("automation/tests/desktop", "initial_focus.html")) |
| 166 << message_; | 166 << message_; |
| 167 } | 167 } |
| 168 | 168 |
| 169 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) { | 169 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) { |
| 170 ASSERT_TRUE( | 170 ASSERT_TRUE( |
| 171 RunExtensionSubtest("automation/tests/desktop", "focus_web.html")) | 171 RunExtensionSubtest("automation/tests/desktop", "focus_web.html")) |
| 172 << message_; | 172 << message_; |
| 173 } | 173 } |
| 174 | 174 |
| 175 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusIframe) { |
| 176 StartEmbeddedTestServer(); |
| 177 ASSERT_TRUE( |
| 178 RunExtensionSubtest("automation/tests/desktop", "focus_iframe.html")) |
| 179 << message_; |
| 180 } |
| 181 |
| 175 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) { | 182 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) { |
| 176 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); | 183 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); |
| 177 // Trigger the shelf subtree to be computed. | 184 // Trigger the shelf subtree to be computed. |
| 178 ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled( | 185 ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled( |
| 179 ash::FOCUS_SHELF); | 186 ash::FOCUS_SHELF); |
| 180 | 187 |
| 181 ASSERT_TRUE( | 188 ASSERT_TRUE( |
| 182 RunExtensionSubtest("automation/tests/desktop", "focus_views.html")) | 189 RunExtensionSubtest("automation/tests/desktop", "focus_views.html")) |
| 183 << message_; | 190 << message_; |
| 184 } | 191 } |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } | 253 } |
| 247 | 254 |
| 248 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DocumentSelection) { | 255 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DocumentSelection) { |
| 249 StartEmbeddedTestServer(); | 256 StartEmbeddedTestServer(); |
| 250 ASSERT_TRUE( | 257 ASSERT_TRUE( |
| 251 RunExtensionSubtest("automation/tests/tabs", "document_selection.html")) | 258 RunExtensionSubtest("automation/tests/tabs", "document_selection.html")) |
| 252 << message_; | 259 << message_; |
| 253 } | 260 } |
| 254 | 261 |
| 255 } // namespace extensions | 262 } // namespace extensions |
| OLD | NEW |