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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) { | 226 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) { |
227 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); | 227 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); |
228 // Trigger the shelf subtree to be computed. | 228 // Trigger the shelf subtree to be computed. |
229 ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled( | 229 ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled( |
230 ash::FOCUS_SHELF); | 230 ash::FOCUS_SHELF); |
231 | 231 |
232 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html")) | 232 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html")) |
233 << message_; | 233 << message_; |
234 } | 234 } |
235 | 235 |
| 236 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopHitTest) { |
| 237 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "hit_test.html")) |
| 238 << message_; |
| 239 } |
| 240 |
236 // Flaky, see http://crbug.com/435449 | 241 // Flaky, see http://crbug.com/435449 |
237 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopLoadTabs) { | 242 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopLoadTabs) { |
238 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html")) | 243 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html")) |
239 << message_; | 244 << message_; |
240 } | 245 } |
241 #endif // defined(OS_CHROMEOS) | 246 #endif // defined(OS_CHROMEOS) |
242 #else // !defined(USE_AURA) | 247 #else // !defined(USE_AURA) |
243 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) { | 248 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) { |
244 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", | 249 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", |
245 "desktop_not_supported.html")) | 250 "desktop_not_supported.html")) |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 << message_; | 290 << message_; |
286 } | 291 } |
287 | 292 |
288 IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) { | 293 IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) { |
289 StartEmbeddedTestServer(); | 294 StartEmbeddedTestServer(); |
290 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "hit_test.html")) | 295 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "hit_test.html")) |
291 << message_; | 296 << message_; |
292 } | 297 } |
293 | 298 |
294 } // namespace extensions | 299 } // namespace extensions |
OLD | NEW |