mash: Change the MediaDelegate to a Media{Controller,Client}.

ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc

Index: ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
index eea69c658b06824195dface88f6bedca36890b3e..9c0bdf6d84c4e62f50e52582b2eb626b8cfcd9ed 100644
--- a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
+++ b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
@@ -5,9 +5,8 @@
 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
 
 #include "ash/common/ash_view_ids.h"
-#include "ash/common/media_delegate.h"
+#include "ash/common/media_controller.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_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
@@ -32,24 +31,25 @@ class MultiProfileMediaTrayView : public TrayItemView,
         UseMd()
             ? gfx::CreateVectorIcon(kSystemTrayRecordingIcon, kTrayIconColor)
             : *bundle.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_RECORDING));
-    OnMediaCaptureChanged();
-    WmShell::Get()->system_tray_notifier()->AddMediaCaptureObserver(this);
+    WmShell::Get()->media_controller()->AddObserver(this);
+    SetVisible(false);
+    WmShell::Get()->media_controller()->RequestCaptureState();
     set_id(VIEW_ID_MEDIA_TRAY_VIEW);
   }
 
   ~MultiProfileMediaTrayView() override {
-    WmShell::Get()->system_tray_notifier()->RemoveMediaCaptureObserver(this);
+    WmShell::Get()->media_controller()->RemoveObserver(this);
   }
 
   // MediaCaptureObserver:
-  void OnMediaCaptureChanged() override {
-    MediaDelegate* media_delegate = WmShell::Get()->media_delegate();
+  void OnMediaCaptureChanged(
+      const std::vector<mojom::MediaCaptureState>& capture_states) override {
     SessionStateDelegate* 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) {
-      if (media_delegate->GetMediaCaptureState(index) != MEDIA_CAPTURE_NONE) {
+      if (capture_states[index] != mojom::MediaCaptureState::NONE) {
         SetVisible(true);
         return;
       }