Chromium Code Reviews| 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 160 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) { | 160 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) { |
| 161 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); | 161 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); |
| 162 // Trigger the shelf subtree to be computed. | 162 // Trigger the shelf subtree to be computed. |
| 163 ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled( | 163 ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled( |
| 164 ash::FOCUS_SHELF); | 164 ash::FOCUS_SHELF); |
| 165 | 165 |
| 166 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html")) | 166 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html")) |
| 167 << message_; | 167 << message_; |
| 168 } | 168 } |
| 169 | 169 |
| 170 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopSelection) { | |
|
David Tseng
2015/09/23 17:57:41
FYI; I used desktop mainly to mean the views+web t
| |
| 171 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "selection.html")) | |
| 172 << message_; | |
| 173 } | |
| 174 | |
| 170 // Flaky, see http://crbug.com/435449 | 175 // Flaky, see http://crbug.com/435449 |
| 171 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopLoadTabs) { | 176 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_DesktopLoadTabs) { |
| 172 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html")) | 177 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html")) |
| 173 << message_; | 178 << message_; |
| 174 } | 179 } |
| 175 #endif // defined(OS_CHROMEOS) | 180 #endif // defined(OS_CHROMEOS) |
| 176 #else // !defined(USE_AURA) | 181 #else // !defined(USE_AURA) |
| 177 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) { | 182 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) { |
| 178 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", | 183 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", |
| 179 "desktop_not_supported.html")) | 184 "desktop_not_supported.html")) |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 206 << message_; | 211 << message_; |
| 207 } | 212 } |
| 208 | 213 |
| 209 IN_PROC_BROWSER_TEST_F(AutomationApiTest, TreeChange) { | 214 IN_PROC_BROWSER_TEST_F(AutomationApiTest, TreeChange) { |
| 210 StartEmbeddedTestServer(); | 215 StartEmbeddedTestServer(); |
| 211 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "tree_change.html")) | 216 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "tree_change.html")) |
| 212 << message_; | 217 << message_; |
| 213 } | 218 } |
| 214 | 219 |
| 215 } // namespace extensions | 220 } // namespace extensions |
| OLD | NEW |