[MediaSession] A fix for MediaSessionService routing

content/browser/media/session/media_session_impl_service_routing_unittest.cc

 // Copyright 2016 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 <map>
 #include <memory>
 
 #include "content/browser/media/session/media_session_player_observer.h"
@@ skipping 56 matching lines @@
 
   void TearDown() override {
     services_.clear();
 
     RenderViewHostImplTestHarness::TearDown();
   }
 
  protected:
   void CreateServiceForFrame(TestRenderFrameHost* frame) {
     services_[frame] = base::MakeUnique<MockMediaSessionServiceImpl>(frame);
-    services_[frame]->SetMetadata(MediaMetadata());
+  }
+
+  void DestroyServiceForFrame(TestRenderFrameHost* frame) {
+    services_.erase(frame);
   }
 
   void StartPlayerForFrame(TestRenderFrameHost* frame) {
     players_[frame] = base::MakeUnique<MockMediaSessionPlayerObserver>(frame);
     MediaSessionImpl::Get(contents())
         ->AddPlayer(players_[frame].get(), kPlayerId,
                     media::MediaContentType::Persistent);
   }
 
   void ClearPlayersForFrame(TestRenderFrameHost* frame) {
@@ skipping 38 matching lines @@
 }
 
 TEST_F(MediaSessionImplServiceRoutingTest,
        OnlySubFrameProducesAudioButHasNoService) {
   StartPlayerForFrame(sub_frame_);
 
   ASSERT_EQ(nullptr, ComputeServiceForRouting());
 }
 
 TEST_F(MediaSessionImplServiceRoutingTest,
-       OnlyMainFrameProducesAudioButHasInactiveService) {
+       OnlyMainFrameProducesAudioButHasDestroyedService) {
+  CreateServiceForFrame(main_frame_);
   StartPlayerForFrame(main_frame_);
-
-  CreateServiceForFrame(main_frame_);
-  services_[main_frame_]->SetMetadata(base::nullopt);
+  DestroyServiceForFrame(main_frame_);
 
   ASSERT_EQ(nullptr, ComputeServiceForRouting());
 }
 
 TEST_F(MediaSessionImplServiceRoutingTest,
-       OnlySubFrameProducesAudioButHasInactiveService) {
+       OnlySubFrameProducesAudioButHasDestroyedService) {
+  CreateServiceForFrame(sub_frame_);
   StartPlayerForFrame(sub_frame_);
-
-  CreateServiceForFrame(sub_frame_);
-  services_[sub_frame_]->SetMetadata(base::nullopt);
+  DestroyServiceForFrame(sub_frame_);
 
   ASSERT_EQ(nullptr, ComputeServiceForRouting());
 }
 
 TEST_F(MediaSessionImplServiceRoutingTest,
+       OnlyMainFrameProducesAudioAndServiceIsCreatedAfterwards) {
+  StartPlayerForFrame(main_frame_);
+  CreateServiceForFrame(main_frame_);
+
+  ASSERT_EQ(services_[main_frame_].get(), ComputeServiceForRouting());
+}
+
+TEST_F(MediaSessionImplServiceRoutingTest,
+       OnlySubFrameProducesAudioAndServiceIsCreatedAfterwards) {
+  StartPlayerForFrame(sub_frame_);
+  CreateServiceForFrame(sub_frame_);
+
+  ASSERT_EQ(services_[sub_frame_].get(), ComputeServiceForRouting());
+}
+
+TEST_F(MediaSessionImplServiceRoutingTest,
        BothFrameProducesAudioButOnlySubFrameHasService) {
   StartPlayerForFrame(main_frame_);
   StartPlayerForFrame(sub_frame_);
 
   CreateServiceForFrame(sub_frame_);
 
   ASSERT_EQ(services_[sub_frame_].get(), ComputeServiceForRouting());
 }
 
 TEST_F(MediaSessionImplServiceRoutingTest, PreferTopMostFrame) {
@@ skipping 13 matching lines @@
 
   CreateServiceForFrame(main_frame_);
   CreateServiceForFrame(sub_frame_);
 
   ClearPlayersForFrame(main_frame_);
 
   ASSERT_EQ(services_[sub_frame_].get(), ComputeServiceForRouting());
 }
 
 }  // namespace content