Promotes more accessors from WmShell to Shell

ash/common/system/user/tray_user.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/user/tray_user.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 26 matching lines @@
 
 namespace ash {
 
 TrayUser::TrayUser(SystemTray* system_tray, UserIndex index)
     : SystemTrayItem(system_tray, UMA_USER),
       user_index_(index),
       user_(nullptr),
       layout_view_(nullptr),
       avatar_(nullptr),
       label_(nullptr) {
-  WmShell::Get()->system_tray_notifier()->AddUserObserver(this);
+  Shell::Get()->system_tray_notifier()->AddUserObserver(this);
 }
 
 TrayUser::~TrayUser() {
-  WmShell::Get()->system_tray_notifier()->RemoveUserObserver(this);
+  Shell::Get()->system_tray_notifier()->RemoveUserObserver(this);
 }
 
 TrayUser::TestState TrayUser::GetStateForTest() const {
   if (!user_)
     return HIDDEN;
   return user_->GetStateForTest();
 }
 
 gfx::Size TrayUser::GetLayoutSizeForTest() const {
   return layout_view_ ? layout_view_->size() : gfx::Size();
@@ skipping 190 matching lines @@
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash