| 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/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 RunExtensionSubtest("automation/tests/desktop", "initial_focus.html")) | 186 RunExtensionSubtest("automation/tests/desktop", "initial_focus.html")) |
| 187 << message_; | 187 << message_; |
| 188 } | 188 } |
| 189 | 189 |
| 190 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) { | 190 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) { |
| 191 ASSERT_TRUE( | 191 ASSERT_TRUE( |
| 192 RunExtensionSubtest("automation/tests/desktop", "focus_web.html")) | 192 RunExtensionSubtest("automation/tests/desktop", "focus_web.html")) |
| 193 << message_; | 193 << message_; |
| 194 } | 194 } |
| 195 | 195 |
| 196 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusIframe) { | 196 // Flaky, see https://crbug.com/724923. |
| 197 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopFocusIframe) { |
| 197 StartEmbeddedTestServer(); | 198 StartEmbeddedTestServer(); |
| 198 ASSERT_TRUE( | 199 ASSERT_TRUE( |
| 199 RunExtensionSubtest("automation/tests/desktop", "focus_iframe.html")) | 200 RunExtensionSubtest("automation/tests/desktop", "focus_iframe.html")) |
| 200 << message_; | 201 << message_; |
| 201 } | 202 } |
| 202 | 203 |
| 203 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) { | 204 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) { |
| 204 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); | 205 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); |
| 205 // Trigger the shelf subtree to be computed. | 206 // Trigger the shelf subtree to be computed. |
| 206 ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled( | 207 ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled( |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 << message_; | 291 << message_; |
| 291 } | 292 } |
| 292 | 293 |
| 293 IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) { | 294 IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) { |
| 294 StartEmbeddedTestServer(); | 295 StartEmbeddedTestServer(); |
| 295 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "hit_test.html")) | 296 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "hit_test.html")) |
| 296 << message_; | 297 << message_; |
| 297 } | 298 } |
| 298 | 299 |
| 299 } // namespace extensions | 300 } // namespace extensions |
| OLD | NEW |