App list: Changed launcher button's tooltip to "Launcher" in Ares mode.

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 277 matching lines @@
   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));
-  EXPECT_EQ("Shelf toolbar Apps Button", speech_monitor_.GetNextUtterance());
+  const char* expected = app_list::switches::IsExperimentalAppListEnabled()
+                             ? "Shelf toolbar Launcher Button"
+                             : "Shelf toolbar 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));
   while (true) {
     std::string utterance = speech_monitor_.GetNextUtterance();
     if (MatchPattern(utterance, "*Button"))
       break;
   }
 
   SendKeyPress(ui::VKEY_RETURN);
 
   // TODO(mgiuca): This is incorrect behaviour; it should read out "Search, text
   // box" or similar (see http://crbug.com/386826).
   EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "Edit text"));
 
   // TODO(mgiuca): The next part of the test fails in the experimental app list,
   // because there is no keyboard navigation (see http://crbug.com/438568). Only
   // check this in the classic app launcher.
   if (!app_list::switches::IsExperimentalAppListEnabled()) {
     SendKeyPress(ui::VKEY_DOWN);
-  EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "* Button"));
+    EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "* Button"));
   }
 }
 
 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, OpenStatusTray) {
   EnableChromeVox();
 
   EXPECT_TRUE(PerformAcceleratorAction(ash::SHOW_SYSTEM_TRAY_BUBBLE));
   EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "Status tray*"));
   EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "time *"));
   EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
@@ skipping 262 matching lines @@
   EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance());
   EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
                            "Combo box * of *"));
   ASSERT_TRUE(
       ui_test_utils::SendKeyPressToWindowSync(
           window, ui::VKEY_TAB, false, false, false, false));
   EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance());
 }
 
 }  // namespace chromeos