[MediaSession] A fix for MediaSessionService routing

content/browser/media/session/media_session_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/session/media_session_impl.h"
 
 #include <algorithm>
 #include "content/browser/media/session/audio_focus_delegate.h"
 #include "content/browser/media/session/media_session_controller.h"
 #include "content/browser/media/session/media_session_player_observer.h"
@@ skipping 557 matching lines @@
   one_shot_players_.insert(PlayerIdentifier(observer, player_id));
   NotifyAboutStateChange();
 
   return true;
 }
 
 // MediaSessionService-related methods
 
 void MediaSessionImpl::OnServiceCreated(MediaSessionServiceImpl* service) {
   services_[service->GetRenderFrameHost()] = service;
+  UpdateRoutedService();
 }
 
 void MediaSessionImpl::OnServiceDestroyed(MediaSessionServiceImpl* service) {
   services_.erase(service->GetRenderFrameHost());
   if (routed_service_ == service) {
     routed_service_ = nullptr;
     UpdateRoutedService();
   }
 }
 
@@ skipping 22 matching lines @@
 
 void MediaSessionImpl::DidReceiveAction(
     blink::mojom::MediaSessionAction action) {
   if (!routed_service_)
     return;
 
   routed_service_->GetClient()->DidReceiveAction(action);
 }
 
 bool MediaSessionImpl::IsServiceActiveForRenderFrameHost(RenderFrameHost* rfh) {
-  if (!services_.count(rfh))
-    return false;
-
-  return services_[rfh]->metadata().has_value() ||
-         !services_[rfh]->actions().empty();
+  return services_.find(rfh) != services_.end();
 }
 
 void MediaSessionImpl::UpdateRoutedService() {
   MediaSessionServiceImpl* new_service = ComputeServiceForRouting();
   if (new_service == routed_service_)
     return;
 
   routed_service_ = new_service;
   if (routed_service_) {
     NotifyMediaSessionMetadataChange(routed_service_->metadata());
@@ skipping 40 matching lines @@
     if (!IsServiceActiveForRenderFrameHost(frame))
       continue;
     best_frame = frame;
     min_depth = depth;
   }
 
   return best_frame ? services_[best_frame] : nullptr;
 }
 
 }  // namespace content