Move AcceleratorController from WmShell to Shell

chrome/browser/ui/ash/accelerator_controller_browsertest.cc

Index: chrome/browser/ui/ash/accelerator_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
index f381e1bcdc8260f6f951f88b66de9d4083d71d36..5e5c9db2aac903c7f797735ef5bc29690f7d6e96 100644
--- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
@@ -5,7 +5,6 @@
 #include "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "build/build_config.h"
@@ -35,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(AcceleratorControllerBrowserTest,
 
   ui::Accelerator accelerator(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);
   ash::AcceleratorController* accelerator_controller =
-      ash::WmShell::Get()->accelerator_controller();
+      ash::Shell::Get()->accelerator_controller();
   ASSERT_TRUE(accelerator_controller->IsRegistered(accelerator));
 
   ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();