Decouple MediaSession messages from WebContents (full patch)

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index e877841175ef50af87b33a1d626c96fccf2179e9..a24ea16d2dff31c2e46d04080e2556a8751f4228 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -61,7 +61,7 @@
 #include "content/browser/media/audio_stream_monitor.h"
 #include "content/browser/media/capture/web_contents_audio_muter.h"
 #include "content/browser/media/media_web_contents_observer.h"
-#include "content/browser/media/session/media_session.h"
+#include "content/browser/media/session/media_session_impl.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/plugin_content_origin_whitelist.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
@@ -3803,33 +3803,6 @@ void WebContentsImpl::OnUpdateFaviconURL(
     observer.DidUpdateFaviconURL(candidates);
 }
 
-void WebContentsImpl::OnMediaSessionStateChanged() {
-  MediaSession* session = MediaSession::Get(this);
-  for (auto& observer : observers_) {
-    observer.MediaSessionStateChanged(session->IsControllable(),
-                                       session->IsSuspended());
-  }
-}
-
-void WebContentsImpl::OnMediaSessionMetadataChanged() {
-  MediaSession* session = MediaSession::Get(this);
-  for (auto& observer : observers_) {
-    observer.MediaSessionMetadataChanged(session->metadata());
-  }
-}
-
-void WebContentsImpl::ResumeMediaSession() {
-  MediaSession::Get(this)->Resume(MediaSession::SuspendType::UI);
-}
-
-void WebContentsImpl::SuspendMediaSession() {
-  MediaSession::Get(this)->Suspend(MediaSession::SuspendType::UI);
-}
-
-void WebContentsImpl::StopMediaSession() {
-  MediaSession::Get(this)->Stop(MediaSession::SuspendType::UI);
-}
-
 void WebContentsImpl::OnPasswordInputShownOnHttp() {
   controller_.ssl_manager()->DidShowPasswordInputOnHttp();
 }