Move AcceleratorController from WmShell to Shell

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/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/system/tray/system_tray.h"
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/speech_monitor.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
@@ skipping 81 matching lines @@
   void SimulateTouchScreenInChromeVox() {
     // ChromeVox looks at whether 'ontouchstart' exists to know whether
     // or not it should respond to hover events. Fake it so that touch
     // exploration events get spoken.
     RunJavaScriptInChromeVoxBackgroundPage(
         "window.ontouchstart = function() {};");
   }
 
   bool PerformAcceleratorAction(ash::AcceleratorAction action) {
     ash::AcceleratorController* controller =
-        ash::WmShell::Get()->accelerator_controller();
+        ash::Shell::Get()->accelerator_controller();
     return controller->PerformActionIfEnabled(action);
   }
 
   void DisableEarcons() {
     // Playing earcons from within a test is not only annoying if you're
     // running the test locally, but seems to cause crashes
     // (http://crbug.com/396507). Work around this by just telling
     // ChromeVox to not ever play earcons (prerecorded sound effects).
     RunJavaScriptInChromeVoxBackgroundPage(
         "cvox.ChromeVox.earcons.playEarcon = function() {};");
@@ skipping 626 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(base::MatchPattern(speech_monitor_.GetNextUtterance(),
                                  "Combo box * of *"));
 }
 
 }  // namespace chromeos