| Index: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
|
| index ef85a8daf378eb697db82c47a70d22eb0751396a..c5c04e5eb6dabc94d6b33940d9c849dbc4e515ab 100644
|
| --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
|
| +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
|
| @@ -125,7 +125,7 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest {
|
| "</script>"));
|
| EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
|
|
| // Block until we get "ready".
|
| while (speech_monitor_.GetNextUtterance() != "ready") {
|
| @@ -161,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(LoggedInSpokenFeedbackTest, AddBookmark) {
|
| ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
| DisableEarcons();
|
|
|
| @@ -245,7 +245,7 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, EnableSpokenFeedback) {
|
| ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
| }
|
|
|
| @@ -253,7 +253,7 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusToolbar) {
|
| ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
| DisableEarcons();
|
|
|
| @@ -268,7 +268,7 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TypeInOmnibox) {
|
| ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
| DisableEarcons();
|
|
|
| @@ -404,7 +404,7 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TouchExploreStatusTray) {
|
| ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
| DisableEarcons();
|
|
|
| @@ -446,7 +446,7 @@ IN_PROC_BROWSER_TEST_F(GuestSpokenFeedbackTest, FocusToolbar) {
|
| ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
| DisableEarcons();
|
|
|
| @@ -494,7 +494,7 @@ IN_PROC_BROWSER_TEST_F(OobeSpokenFeedbackTest, DISABLED_SpokenFeedbackInOobe) {
|
| gfx::NativeWindow window = widget->GetNativeWindow();
|
|
|
| AccessibilityManager::Get()->EnableSpokenFeedback(
|
| - true, ash::A11Y_NOTIFICATION_NONE);
|
| + true, ui::A11Y_NOTIFICATION_NONE);
|
| EXPECT_TRUE(speech_monitor_.SkipChromeVoxEnabledMessage());
|
|
|
| EXPECT_EQ("Select your language:", speech_monitor_.GetNextUtterance());
|
|
|