Hotfix for MediaSession::OnPlayerPaused

content/browser/media/session/media_session.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.h"
 
 #include "content/browser/media/session/audio_focus_delegate.h"
 #include "content/browser/media/session/media_session_player_observer.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 150 matching lines @@
       MediaSessionSuspendedSource::SystemTransientDuck);
 }
 
 void MediaSession::OnPlayerPaused(MediaSessionPlayerObserver* observer,
                                   int player_id) {
   // If a playback is completed, BrowserMediaPlayerManager will call
   // OnPlayerPaused() after RemovePlayer(). This is a workaround.
   // Also, this method may be called when a player that is not added
   // to this session (e.g. a silent video) is paused. MediaSession
   // should ignore the paused player for this case.
-  if (!players_.count(PlayerIdentifier(observer, player_id)))
+  if (!players_.count(PlayerIdentifier(observer, player_id)) &&
+      !pepper_players_.count(PlayerIdentifier(observer, player_id))) {
     return;
+  }
 
-  // If there is more than one observer, remove the paused one from the session.
-  if (players_.size() != 1) {
+  // If the player to be removed is a pepper player, or there is more than one
+  // observer, remove the paused one from the session.
+  if (pepper_players_.count(PlayerIdentifier(observer, player_id)) ||
+      players_.size() != 1) {
     RemovePlayer(observer, player_id);
     return;
   }
 
   // Otherwise, suspend the session.
   DCHECK(!IsSuspended());
   OnSuspendInternal(SuspendType::CONTENT, State::SUSPENDED);
 }
 
 void MediaSession::Resume(SuspendType suspend_type) {
@@ skipping 246 matching lines @@
   DCHECK(success);
 
   pepper_players_.insert(PlayerIdentifier(observer, player_id));
 
   observer->OnSetVolumeMultiplier(player_id, GetVolumeMultiplier());
 
   return true;
 }
 
 }  // namespace content