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

ash/test/test_shell_delegate.h

Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index b3aee0c53d4cab8d52a0a6c6ffca1537bc55a24b..a2722bec7e1bea744116d54b843ef297f8b1aed5 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 
-#include "ash/common/media_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "base/macros.h"
@@ -52,7 +51,6 @@ class TestShellDelegate : public ShellDelegate {
   std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
   TestSessionStateDelegate* CreateSessionStateDelegate() override;
   AccessibilityDelegate* CreateAccessibilityDelegate() override;
-  MediaDelegate* CreateMediaDelegate() override;
   std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
   ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
                                    const ShelfItem* item) override;
@@ -71,7 +69,6 @@ class TestShellDelegate : public ShellDelegate {
     return app_list_presenter_.get();
   }
 
-  void SetMediaCaptureState(MediaCaptureState state);
   void SetForceMaximizeOnFirstRun(bool maximize) {
     force_maximize_on_first_run_ = maximize;
   }