| 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/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/tray/system_tray.h" | 10 #include "ash/system/tray/system_tray.h" |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 // dialog in the OOBE. Avoid confusing the tests with that. | 568 // dialog in the OOBE. Avoid confusing the tests with that. |
| 569 command_line->AppendSwitch(chromeos::switches::kDisableHIDDetectionOnOOBE); | 569 command_line->AppendSwitch(chromeos::switches::kDisableHIDDetectionOnOOBE); |
| 570 } | 570 } |
| 571 | 571 |
| 572 SpeechMonitor speech_monitor_; | 572 SpeechMonitor speech_monitor_; |
| 573 | 573 |
| 574 private: | 574 private: |
| 575 DISALLOW_COPY_AND_ASSIGN(OobeSpokenFeedbackTest); | 575 DISALLOW_COPY_AND_ASSIGN(OobeSpokenFeedbackTest); |
| 576 }; | 576 }; |
| 577 | 577 |
| 578 IN_PROC_BROWSER_TEST_F(OobeSpokenFeedbackTest, SpokenFeedbackInOobe) { | 578 // Test is flaky: http://crbug.com/346797 |
| 579 IN_PROC_BROWSER_TEST_F(OobeSpokenFeedbackTest, DISABLED_SpokenFeedbackInOobe) { |
| 579 ui_controls::EnableUIControls(); | 580 ui_controls::EnableUIControls(); |
| 580 ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); | 581 ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); |
| 581 | 582 |
| 582 LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host(); | 583 LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host(); |
| 583 WebUILoginView* web_ui_login_view = login_display_host->GetWebUILoginView(); | 584 WebUILoginView* web_ui_login_view = login_display_host->GetWebUILoginView(); |
| 584 views::Widget* widget = web_ui_login_view->GetWidget(); | 585 views::Widget* widget = web_ui_login_view->GetWidget(); |
| 585 gfx::NativeWindow window = widget->GetNativeWindow(); | 586 gfx::NativeWindow window = widget->GetNativeWindow(); |
| 586 | 587 |
| 587 // We expect to be in the language select dropdown for this test to work, | 588 // We expect to be in the language select dropdown for this test to work, |
| 588 // so make sure that's the case. | 589 // so make sure that's the case. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 605 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 606 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
| 606 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); | 607 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); |
| 607 while (speech_monitor_.GetNextUtterance() != "Select your language:") { | 608 while (speech_monitor_.GetNextUtterance() != "Select your language:") { |
| 608 } | 609 } |
| 609 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); | 610 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); |
| 610 EXPECT_TRUE( | 611 EXPECT_TRUE( |
| 611 MatchPattern(speech_monitor_.GetNextUtterance(), "Combo box * of *")); | 612 MatchPattern(speech_monitor_.GetNextUtterance(), "Combo box * of *")); |
| 612 } | 613 } |
| 613 | 614 |
| 614 } // namespace chromeos | 615 } // namespace chromeos |
| OLD | NEW |