diff options
| -rw-r--r-- | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index 20567ea..b2bd8e3 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc @@ -134,8 +134,7 @@ class OobeSpokenFeedbackTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(OobeSpokenFeedbackTest); }; -// Test is flaky: http://crbug.com/346797 -IN_PROC_BROWSER_TEST_F(OobeSpokenFeedbackTest, DISABLED_SpokenFeedbackInOobe) { +IN_PROC_BROWSER_TEST_F(OobeSpokenFeedbackTest, SpokenFeedbackInOobe) { ui_controls::EnableUIControls(); EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); @@ -149,11 +148,15 @@ IN_PROC_BROWSER_TEST_F(OobeSpokenFeedbackTest, DISABLED_SpokenFeedbackInOobe) { true, ash::A11Y_NOTIFICATION_NONE); EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); - EXPECT_EQ("Select your language:", monitor.GetNextUtterance()); - EXPECT_EQ("English ( United States)", monitor.GetNextUtterance()); - EXPECT_TRUE(MatchPattern(monitor.GetNextUtterance(), "Combo box * of *")); - ui_controls::SendKeyPress(window, ui::VKEY_TAB, false, false, false, false); - EXPECT_EQ("Select your keyboard:", monitor.GetNextUtterance()); + // If we keep tabbing, we should eventually reach the Continue button. + do { + ui_controls::SendKeyPress(window, ui::VKEY_TAB, false, false, false, false); + } while (monitor.GetNextUtterance() != "Continue"); + + // If we keep tabbing, we should eventually reach the Shut Down button too. + do { + ui_controls::SendKeyPress(window, ui::VKEY_TAB, false, false, false, false); + } while (monitor.GetNextUtterance() != "Shut down"); } } // namespace chromeos |