Allow MediaSession in iframes to be routed

content/browser/media/session/media_session_service_impl.cc

Index: content/browser/media/session/media_session_service_impl.cc
diff --git a/content/browser/media/session/media_session_service_impl.cc b/content/browser/media/session/media_session_service_impl.cc
index 589823fab2b78f83bf7575e5044575a57642f1eb..6c9ce1f436263a3dc3a3e284c8abf9284574809e 100644
--- a/content/browser/media/session/media_session_service_impl.cc
+++ b/content/browser/media/session/media_session_service_impl.cc
@@ -17,13 +17,13 @@ MediaSessionServiceImpl::MediaSessionServiceImpl(
     : render_frame_host_(render_frame_host) {
   MediaSessionImpl* session = GetMediaSession();
   if (session)
-    session->SetMediaSessionService(this);
+    session->OnServiceCreated(this);
 }
 
 MediaSessionServiceImpl::~MediaSessionServiceImpl() {
   MediaSessionImpl* session = GetMediaSession();
-  if (session && session->GetMediaSessionService() == this)
-    session->SetMediaSessionService(nullptr);
+  if (session)
+    session->OnServiceDestroyed(this);
 }
 
 // static
@@ -50,24 +50,27 @@ void MediaSessionServiceImpl::SetMetadata(
         RenderProcessHost::CrashReportMode::GENERATE_CRASH_DUMP);
     return;
   }
+  metadata_ = metadata;
 
   MediaSessionImpl* session = GetMediaSession();
   if (session)
-    session->SetMetadata(metadata);
+    session->OnMediaSessionMetadataChanged(this);
 }
 
 void MediaSessionServiceImpl::EnableAction(
     blink::mojom::MediaSessionAction action) {
+  actions_.insert(action);
   MediaSessionImpl* session = GetMediaSession();
   if (session)
-    session->OnMediaSessionEnabledAction(action);
+    session->OnMediaSessionActionsChanged(this);
 }
 
 void MediaSessionServiceImpl::DisableAction(
     blink::mojom::MediaSessionAction action) {
+  actions_.erase(action);
   MediaSessionImpl* session = GetMediaSession();
   if (session)
-    session->OnMediaSessionDisabledAction(action);
+    session->OnMediaSessionActionsChanged(this);
 }
 
 MediaSessionImpl* MediaSessionServiceImpl::GetMediaSession() {
@@ -75,8 +78,6 @@ MediaSessionImpl* MediaSessionServiceImpl::GetMediaSession() {
       WebContentsImpl::FromRenderFrameHost(render_frame_host_));
   if (!contents)
     return nullptr;
-  if (render_frame_host_ != contents->GetMainFrame())
-    return nullptr;
   return MediaSessionImpl::Get(contents);
 }