Move yet more from WmShell to Shell

ash/common/shelf/shelf_locking_manager.cc

 // Copyright 2016 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/shelf/shelf_locking_manager.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 
 namespace ash {
 
 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();
   controller->AddSessionStateObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 ShelfLockingManager::~ShelfLockingManager() {
   WmShell::Get()->RemoveLockStateObserver(this);
-  WmShell::Get()->session_controller()->RemoveSessionStateObserver(this);
+  Shell::Get()->session_controller()->RemoveSessionStateObserver(this);
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void ShelfLockingManager::OnLockStateChanged(bool locked) {
   screen_locked_ = locked;
   UpdateLockedState();
 }
 
 void ShelfLockingManager::SessionStateChanged(
     session_manager::SessionState state) {
@@ skipping 11 matching lines @@
   const ShelfAlignment alignment = shelf_->GetAlignment();
   if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     stored_alignment_ = alignment;
     shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
   } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_->SetAlignment(stored_alignment_);
   }
 }
 
 }  // namespace ash