| 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/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/accelerators/accelerator_table.h" | 8 #include "ash/accelerators/accelerator_table.h" |
| 9 #include "ash/accessibility_types.h" | 9 #include "ash/accessibility_types.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 // Press Search+/ to enter ChromeVox's "find in page". | 525 // Press Search+/ to enter ChromeVox's "find in page". |
| 526 SendKeyPressWithSearch(ui::VKEY_OEM_2); | 526 SendKeyPressWithSearch(ui::VKEY_OEM_2); |
| 527 | 527 |
| 528 while (true) { | 528 while (true) { |
| 529 std::string utterance = speech_monitor_.GetNextUtterance(); | 529 std::string utterance = speech_monitor_.GetNextUtterance(); |
| 530 if (utterance == "Find in page.") | 530 if (utterance == "Find in page.") |
| 531 break; | 531 break; |
| 532 } | 532 } |
| 533 } | 533 } |
| 534 | 534 |
| 535 #if defined(MEMORY_SANITIZER) | 535 #if defined(MEMORY_SANITIZER) || defined(OS_CHROMEOS) |
| 536 // Fails under MemorySanitizer: http://crbug.com/472125 | 536 // Fails under MemorySanitizer: http://crbug.com/472125 |
| 537 // TODO(crbug.com/721475): Flaky on CrOS. |
| 537 #define MAYBE_ChromeVoxNavigateAndSelect DISABLED_ChromeVoxNavigateAndSelect | 538 #define MAYBE_ChromeVoxNavigateAndSelect DISABLED_ChromeVoxNavigateAndSelect |
| 538 #else | 539 #else |
| 539 #define MAYBE_ChromeVoxNavigateAndSelect ChromeVoxNavigateAndSelect | 540 #define MAYBE_ChromeVoxNavigateAndSelect ChromeVoxNavigateAndSelect |
| 540 #endif | 541 #endif |
| 541 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, MAYBE_ChromeVoxNavigateAndSelect) { | 542 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, MAYBE_ChromeVoxNavigateAndSelect) { |
| 542 EnableChromeVox(); | 543 EnableChromeVox(); |
| 543 | 544 |
| 544 ui_test_utils::NavigateToURL(browser(), | 545 ui_test_utils::NavigateToURL(browser(), |
| 545 GURL("data:text/html;charset=utf-8," | 546 GURL("data:text/html;charset=utf-8," |
| 546 "<h1>Title</h1>" | 547 "<h1>Title</h1>" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 750 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
| 750 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); | 751 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); |
| 751 while (speech_monitor_.GetNextUtterance() != "Select your language:") { | 752 while (speech_monitor_.GetNextUtterance() != "Select your language:") { |
| 752 } | 753 } |
| 753 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); | 754 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); |
| 754 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), | 755 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), |
| 755 "Combo box * of *")); | 756 "Combo box * of *")); |
| 756 } | 757 } |
| 757 | 758 |
| 758 } // namespace chromeos | 759 } // namespace chromeos |
| OLD | NEW |