mash: Move SystemTrayDelegate ownership to WmShell

chrome/browser/chromeos/power/power_button_observer.cc

Index: chrome/browser/chromeos/power/power_button_observer.cc
diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc
index 1ae37bcca8c68770b19a45cb248cb63b65c372ea..fa3aaa433178c3ad3d6981bd8c365a430fa3b725 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/power/power_button_observer.h"
 
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/power_button_controller.h"
@@ -24,10 +25,9 @@ namespace chromeos {
 namespace {
 
 ash::LoginStatus GetCurrentLoginStatus() {
-  if (!ash::Shell::GetInstance()->system_tray_delegate())
+  if (!ash::WmShell::Get()->system_tray_delegate())

[msw, 2016/06/10 18:48:21]

optional nit: flip conditional and swap returns

[James Cook, 2016/06/10 20:20:32]

Done.

     return ash::LoginStatus::NOT_LOGGED_IN;
-  return ash::Shell::GetInstance()->system_tray_delegate()->
-      GetUserLoginStatus();
+  return ash::WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace