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

ash/test/test_shell_delegate.cc

Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index d91c64490bf0402b2b7b33d74b129c50afecda5e..3402d6ad1044312372910a7a7ac0d385ce0cb119 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -10,7 +10,6 @@
 #include "ash/app_list/app_list_presenter_delegate_factory.h"
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/gpu_support_stub.h"
-#include "ash/common/media_delegate.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/test/test_session_state_delegate.h"
@@ -38,27 +37,6 @@ namespace ash {
 namespace test {
 namespace {
 
-class MediaDelegateImpl : public MediaDelegate {
- public:
-  MediaDelegateImpl() : state_(MEDIA_CAPTURE_NONE) {}
-  ~MediaDelegateImpl() override {}
-
-  void set_media_capture_state(MediaCaptureState state) { state_ = state; }
-
- private:
-  // MediaDelegate:
-  void HandleMediaNextTrack() override {}
-  void HandleMediaPlayPause() override {}
-  void HandleMediaPrevTrack() override {}
-  MediaCaptureState GetMediaCaptureState(UserIndex index) override {
-    return state_;
-  }
-
-  MediaCaptureState state_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl);
-};
-
 class AppListViewDelegateFactoryImpl
     : public app_list::AppListViewDelegateFactory {
  public:
@@ -159,10 +137,6 @@ AccessibilityDelegate* TestShellDelegate::CreateAccessibilityDelegate() {
   return new DefaultAccessibilityDelegate();
 }
 
-MediaDelegate* TestShellDelegate::CreateMediaDelegate() {
-  return new MediaDelegateImpl;
-}
-
 std::unique_ptr<PaletteDelegate> TestShellDelegate::CreatePaletteDelegate() {
   return nullptr;
 }
@@ -198,13 +172,5 @@ void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
 
 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
 
-void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
-#if defined(OS_CHROMEOS)
-  static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate())
-      ->set_media_capture_state(state);
-  WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged();
-#endif
-}
-
 }  // namespace test
 }  // namespace ash