Move yet more from WmShell to Shell

ash/common/system/web_notification/web_notification_tray.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/system/web_notification/web_notification_tray.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 598 matching lines @@
   message_center_tray_->HideMessageCenterBubble();
 }
 
 message_center::MessageCenter* WebNotificationTray::message_center() const {
   return message_center_tray_->message_center();
 }
 
 bool WebNotificationTray::IsLoggedIn() const {
   return Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
              LoginStatus::NOT_LOGGED_IN &&
-         !WmShell::Get()->session_controller()->IsInSecondaryLoginScreen();
+         !Shell::Get()->session_controller()->IsInSecondaryLoginScreen();
 }
 
 // Methods for testing
 
 bool WebNotificationTray::IsPopupVisible() const {
   return message_center_tray_->popups_visible();
 }
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash