Move yet more from WmShell to Shell

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 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 "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ash_switches.h"
@@ skipping 1268 matching lines @@
 
   ui::Accelerator CreateAccelerator(const AcceleratorData& data) const {
     ui::Accelerator result(data.keycode, data.modifiers);
     result.set_key_state(data.trigger_on_press
                              ? ui::Accelerator::KeyState::PRESSED
                              : ui::Accelerator::KeyState::RELEASED);
     return result;
   }
 
   void ResetStateIfNeeded() {
-    if (WmShell::Get()->session_controller()->IsScreenLocked() ||
-        WmShell::Get()->session_controller()->IsUserSessionBlocked()) {
+    if (Shell::Get()->session_controller()->IsScreenLocked() ||
+        Shell::Get()->session_controller()->IsUserSessionBlocked()) {
       UnblockUserSession();
     }
   }
 
   bool ContainsDeprecatedAcceleratorNotification(const char* const id) const {
     return nullptr != message_center()->FindVisibleNotificationById(id);
   }
 
   bool IsMessageCenterEmpty() const {
     return message_center()->GetVisibleNotifications().empty();
@@ skipping 60 matching lines @@
     // Expect no notifications from the new accelerators.
     EXPECT_TRUE(IsMessageCenterEmpty());
 
     // If the action is LOCK_SCREEN, we must reset the state by unlocking the
     // screen before we proceed testing the rest of accelerators.
     ResetStateIfNeeded();
   }
 }
 
 }  // namespace ash