| 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 <queue> | 5 #include <queue> |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_controller.h" | 7 #include "ash/common/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/accelerators/accelerator_table.h" | 8 #include "ash/common/accelerators/accelerator_table.h" |
| 9 #include "ash/common/accessibility_types.h" | 9 #include "ash/common/accessibility_types.h" |
| 10 #include "ash/common/system/tray/system_tray.h" | 10 #include "ash/common/system/tray/system_tray.h" |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 } | 288 } |
| 289 } | 289 } |
| 290 }; | 290 }; |
| 291 | 291 |
| 292 INSTANTIATE_TEST_CASE_P( | 292 INSTANTIATE_TEST_CASE_P( |
| 293 TestAsNormalAndGuestUser, | 293 TestAsNormalAndGuestUser, |
| 294 SpokenFeedbackTest, | 294 SpokenFeedbackTest, |
| 295 ::testing::Values(kTestAsNormalUser, | 295 ::testing::Values(kTestAsNormalUser, |
| 296 kTestAsGuestUser)); | 296 kTestAsGuestUser)); |
| 297 | 297 |
| 298 // TODO(crbug.com/630031): Flaky on ASan LSan bot. | 298 // TODO(tommi): Flakily hitting HasOneRef DCHECK in |
| 299 #if defined(ADDRESS_SANITIZER) | 299 // AudioOutputResampler::Shutdown, see crbug.com/630031. |
| 300 #define MAYBE_EnableSpokenFeedback DISABLED_EnableSpokenFeedback | 300 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, DISABLED_EnableSpokenFeedback) { |
| 301 #else | |
| 302 #define MAYBE_EnableSpokenFeedback EnableSpokenFeedback | |
| 303 #endif // defined(ADDRESS_SANITIZER) | |
| 304 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, MAYBE_EnableSpokenFeedback) { | |
| 305 EnableChromeVox(); | 301 EnableChromeVox(); |
| 306 } | 302 } |
| 307 | 303 |
| 308 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusToolbar) { | 304 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusToolbar) { |
| 309 EnableChromeVox(); | 305 EnableChromeVox(); |
| 310 chrome::ExecuteCommand(browser(), IDC_FOCUS_TOOLBAR); | 306 chrome::ExecuteCommand(browser(), IDC_FOCUS_TOOLBAR); |
| 311 EXPECT_EQ("Reload", speech_monitor_.GetNextUtterance()); | 307 EXPECT_EQ("Reload", speech_monitor_.GetNextUtterance()); |
| 312 EXPECT_EQ("Button", speech_monitor_.GetNextUtterance()); | 308 EXPECT_EQ("Button", speech_monitor_.GetNextUtterance()); |
| 313 EXPECT_EQ("main", speech_monitor_.GetNextUtterance()); | 309 EXPECT_EQ("main", speech_monitor_.GetNextUtterance()); |
| 314 EXPECT_EQ("Tool bar", speech_monitor_.GetNextUtterance()); | 310 EXPECT_EQ("Tool bar", speech_monitor_.GetNextUtterance()); |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 790 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
| 795 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); | 791 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); |
| 796 while (speech_monitor_.GetNextUtterance() != "Select your language:") { | 792 while (speech_monitor_.GetNextUtterance() != "Select your language:") { |
| 797 } | 793 } |
| 798 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); | 794 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); |
| 799 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), | 795 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), |
| 800 "Combo box * of *")); | 796 "Combo box * of *")); |
| 801 } | 797 } |
| 802 | 798 |
| 803 } // namespace chromeos | 799 } // namespace chromeos |
| OLD | NEW |