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

ash/mus/shell_delegate_mus.cc

Index: ash/mus/shell_delegate_mus.cc
diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc
index 054100e6e6ab174db846414294f5d82e90cc4559..d47e87f30b0fe5676d6a364641c34d0bedcf0df8 100644
--- a/ash/mus/shell_delegate_mus.cc
+++ b/ash/mus/shell_delegate_mus.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #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/wm_shell.h"
@@ -89,24 +88,6 @@ class SessionStateDelegateStub : public SessionStateDelegate {
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
-class MediaDelegateStub : public MediaDelegate {
- public:
-  MediaDelegateStub() {}
-  ~MediaDelegateStub() override {}
-
-  // MediaDelegate:
-  void HandleMediaNextTrack() override { NOTIMPLEMENTED(); }
-  void HandleMediaPlayPause() override { NOTIMPLEMENTED(); }
-  void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); }
-  MediaCaptureState GetMediaCaptureState(UserIndex index) override {
-    NOTIMPLEMENTED();
-    return MEDIA_CAPTURE_NONE;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
-};
-
 }  // namespace
 
 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector)
@@ -198,12 +179,6 @@ AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
   return new AccessibilityDelegateMus(connector_);
 }
 
-MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
-  // TODO: http://crbug.com/647409.
-  NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
-  return new MediaDelegateStub;
-}
-
 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() {
   // TODO: http://crbug.com/647417.
   NOTIMPLEMENTED();