Move yet more from WmShell to Shell

ash/common/shelf/shelf_locking_manager.cc

Index: ash/common/shelf/shelf_locking_manager.cc
diff --git a/ash/common/shelf/shelf_locking_manager.cc b/ash/common/shelf/shelf_locking_manager.cc
index a897049466de0dbbf4ea90c4f40114219b95f09c..84bfcbfa9c1cc4d10fe53cd100bbf2eef16731e5 100644
--- a/ash/common/shelf/shelf_locking_manager.cc
+++ b/ash/common/shelf/shelf_locking_manager.cc
@@ -15,7 +15,7 @@ ShelfLockingManager::ShelfLockingManager(WmShelf* shelf)
     : shelf_(shelf), stored_alignment_(shelf->GetAlignment()) {
   DCHECK(shelf_);
   WmShell::Get()->AddLockStateObserver(this);
-  SessionController* controller = WmShell::Get()->session_controller();
+  SessionController* controller = Shell::Get()->session_controller();
   session_locked_ =
       controller->GetSessionState() != session_manager::SessionState::ACTIVE;
   screen_locked_ = controller->IsScreenLocked();
@@ -25,7 +25,7 @@ ShelfLockingManager::ShelfLockingManager(WmShelf* shelf)
 
 ShelfLockingManager::~ShelfLockingManager() {
   WmShell::Get()->RemoveLockStateObserver(this);
-  WmShell::Get()->session_controller()->RemoveSessionStateObserver(this);
+  Shell::Get()->session_controller()->RemoveSessionStateObserver(this);
   Shell::GetInstance()->RemoveShellObserver(this);
 }