mash: Move SystemTrayDelegate ownership to WmShell

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index fafa99d727ff2d0638c0fc54f45b8db5ecb9d19f..aff637b4fa920a5f87e5ce4c72092f705b22431b 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -24,6 +24,7 @@
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_shell_common.h"
 #include "ash/container_delegate.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ -727,8 +728,8 @@ Shell::~Shell() {
   // Destroy SystemTrayDelegate before destroying the status area(s). Make sure
   // to deinitialize the shelf first, as it is initialized after the delegate.
   ShutdownShelf();
-  system_tray_delegate_->Shutdown();
-  system_tray_delegate_.reset();
+  wm_shell_->system_tray_delegate()->Shutdown();
+  wm_shell_->SetSystemTrayDelegate(nullptr);
 
   locale_notification_controller_.reset();
 
@@ -1079,14 +1080,16 @@ void Shell::Init(const ShellInitParams& init_params) {
   // Create system_tray_notifier_ before the delegate.
   system_tray_notifier_.reset(new SystemTrayNotifier());
 
-  // Initialize system_tray_delegate_ before initializing StatusAreaWidget.
-  system_tray_delegate_.reset(delegate()->CreateSystemTrayDelegate());
-  DCHECK(system_tray_delegate_.get());
+  // Initialize system tray delegate before initializing StatusAreaWidget.

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

I don't think these StatusAreaWidget comments are even still relevant; consider
removing them and calling Initialize immediately after SetSystemTrayDelegate? We
could even have WmShell::SetSystemTrayDelegate call Initialize and Shutdown...

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

I removed the comments and moved initialization/shutdown into
WmShell::SetSystemTrayDelegate.

+  SystemTrayDelegate* system_tray_delegate =
+      delegate()->CreateSystemTrayDelegate();
+  DCHECK(system_tray_delegate);
+  wm_shell_->SetSystemTrayDelegate(base::WrapUnique(system_tray_delegate));
 
   locale_notification_controller_.reset(new LocaleNotificationController);
 
-  // Initialize system_tray_delegate_ after StatusAreaWidget is created.
-  system_tray_delegate_->Initialize();
+  // Initialize system tray delegate after StatusAreaWidget is created.
+  wm_shell_->system_tray_delegate()->Initialize();
 
   // Initialize toast manager
   toast_manager_.reset(new ToastManager);
@@ -1095,7 +1098,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   // Create the LogoutConfirmationController after the SystemTrayDelegate.
   logout_confirmation_controller_.reset(new LogoutConfirmationController(
       base::Bind(&SystemTrayDelegate::SignOut,
-                 base::Unretained(system_tray_delegate_.get()))));
+                 base::Unretained(system_tray_delegate))));
 
   // Create TouchTransformerController before
   // WindowTreeHostManager::InitDisplays()