mash: Migrate remaining tray observers and notify functions.

ash/system/chromeos/media_security/multi_profile_media_tray_item.cc

Index: ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/system/tray/media_security/multi_profile_media_tray_item.cc b/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
similarity index 83%
rename from ash/system/tray/media_security/multi_profile_media_tray_item.cc
rename to ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
index 48f8858cf4eaaa5d2e8f77678fc3ab6a757b8be5..ee85f490db9df15e387e2419bf10a38da4327d4a 100644
--- a/ash/system/tray/media_security/multi_profile_media_tray_item.cc
+++ b/ash/system/chromeos/media_security/multi_profile_media_tray_item.cc
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/tray/media_security/multi_profile_media_tray_item.h"
+#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
 
 #include "ash/ash_view_ids.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/chromeos/media_security/media_capture_observer.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_item_view.h"
+#include "ash/common/wm_shell.h"
 #include "ash/media_delegate.h"
 #include "ash/shell.h"
-#include "ash/system/tray/media_security/media_capture_observer.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
@@ -31,20 +32,19 @@ class MultiProfileMediaTrayView : public TrayItemView,
         bundle.GetImageNamed(IDR_AURA_UBER_TRAY_RECORDING).ToImageSkia());
     AddChildView(icon);
     OnMediaCaptureChanged();
-    Shell::GetInstance()->system_tray_notifier()->AddMediaCaptureObserver(this);
+    WmShell::Get()->system_tray_notifier()->AddMediaCaptureObserver(this);
     set_id(VIEW_ID_MEDIA_TRAY_VIEW);
   }
 
   ~MultiProfileMediaTrayView() override {
-    Shell::GetInstance()->system_tray_notifier()->RemoveMediaCaptureObserver(
-        this);
+    WmShell::Get()->system_tray_notifier()->RemoveMediaCaptureObserver(this);
   }
 
   // MediaCaptureObserver:
   void OnMediaCaptureChanged() override {
     MediaDelegate* media_delegate = Shell::GetInstance()->media_delegate();
     SessionStateDelegate* session_state_delegate =
-        Shell::GetInstance()->session_state_delegate();
+        WmShell::Get()->GetSessionStateDelegate();
     // The user at 0 is the current desktop user.
     for (UserIndex index = 1;
          index < session_state_delegate->NumberOfLoggedInUsers(); ++index) {