Add a role info dictionary to output.js to resolve role msgs.

chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <queue>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 245 matching lines @@
     ::testing::Values(kTestAsNormalUser,
                       kTestAsGuestUser));
 
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, EnableSpokenFeedback) {
   EnableChromeVox();
 }
 
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusToolbar) {
   EnableChromeVox();
   chrome::ExecuteCommand(browser(), IDC_FOCUS_TOOLBAR);
-  EXPECT_TRUE(
-      MatchPattern(speech_monitor_.GetNextUtterance(),
-                   "about:blank*toolbar Reload Button"));
+  EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
+                           "about:blank*Tool bar Reload Button"));
 }
 
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TypeInOmnibox) {
   EnableChromeVox();
 
   chrome::ExecuteCommand(browser(), IDC_FOCUS_LOCATION);
-  EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "*Edit text"));
+  EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "*Edit text*"));
 
   SendKeyPress(ui::VKEY_X);
   EXPECT_EQ("x", speech_monitor_.GetNextUtterance());
 
   SendKeyPress(ui::VKEY_Y);
   EXPECT_EQ("y", speech_monitor_.GetNextUtterance());
 
   SendKeyPress(ui::VKEY_Z);
   EXPECT_EQ("z", speech_monitor_.GetNextUtterance());
 
   SendKeyPress(ui::VKEY_BACK);
   EXPECT_EQ("z", speech_monitor_.GetNextUtterance());
 }
 
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusShelf) {
   EnableChromeVox();
 
   EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF));
   const char* expected = app_list::switches::IsExperimentalAppListEnabled()
-                             ? "Shelf toolbar Launcher Button"
-                             : "Shelf toolbar Apps Button";
+                             ? "Shelf Tool bar Launcher Button"
+                             : "Shelf Tool bar Apps Button";
   EXPECT_EQ(expected, speech_monitor_.GetNextUtterance());
 
   SendKeyPress(ui::VKEY_TAB);
   EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "* Button"));
 }
 
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, NavigateAppLauncher) {
   EnableChromeVox();
 
   EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF));
@@ skipping 228 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GuestSpokenFeedbackTest);
 };
 
 IN_PROC_BROWSER_TEST_F(GuestSpokenFeedbackTest, FocusToolbar) {
   EnableChromeVox();
 
   chrome::ExecuteCommand(browser(), IDC_FOCUS_TOOLBAR);
 
-  EXPECT_TRUE(
-      MatchPattern(speech_monitor_.GetNextUtterance(),
-                   "about:blank*toolbar Reload Button"));
+  EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
+                           "about:blank*Tool bar Reload Button"));
 }
 
 //
 // Spoken feedback tests of the out-of-box experience.
 //
 
 class OobeSpokenFeedbackTest : public LoginManagerTest {
  protected:
   OobeSpokenFeedbackTest() : LoginManagerTest(false) {}
   ~OobeSpokenFeedbackTest() override {}
@@ skipping 42 matching lines @@
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       window, ui::VKEY_TAB, false, true /*shift*/, false, false));
   while (speech_monitor_.GetNextUtterance() != "Select your language:") {
   }
   EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance());
   EXPECT_TRUE(
       MatchPattern(speech_monitor_.GetNextUtterance(), "Combo box * of *"));
 }
 
 }  // namespace chromeos