Route Pepper MediaSession messages to frames

content/browser/media/session/pepper_playback_observer.cc

Index: content/browser/media/session/pepper_playback_observer.cc
diff --git a/content/browser/media/session/pepper_playback_observer.cc b/content/browser/media/session/pepper_playback_observer.cc
index 593d3d727788cbe6e11d9ef6fddc44479fed0e47..923567e34ecc7b6c7ca5c0e32837bc98ccc21353 100644
--- a/content/browser/media/session/pepper_playback_observer.cc
+++ b/content/browser/media/session/pepper_playback_observer.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/media/session/pepper_playback_observer.h"
 
-#include "base/feature_list.h"
+#include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "content/browser/media/session/media_session_impl.h"
 #include "content/browser/media/session/pepper_player_delegate.h"
@@ -25,7 +25,7 @@ bool ShouldDuckFlash() {
 
 }  // anonymous namespace
 
-PepperPlaybackObserver::PepperPlaybackObserver(WebContentsImpl *contents)
+PepperPlaybackObserver::PepperPlaybackObserver(WebContents *contents)
     : contents_(contents) {}
 
 PepperPlaybackObserver::~PepperPlaybackObserver() {
@@ -41,41 +41,51 @@ PepperPlaybackObserver::~PepperPlaybackObserver() {
   }
 }
 
-void PepperPlaybackObserver::PepperInstanceCreated(int32_t pp_instance) {
-  players_played_sound_map_[pp_instance] = false;
+void PepperPlaybackObserver::PepperInstanceCreated(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
+  PlayerId id(render_frame_host, pp_instance);
+  players_played_sound_map_[id] = false;
 }
 
-void PepperPlaybackObserver::PepperInstanceDeleted(int32_t pp_instance) {
+void PepperPlaybackObserver::PepperInstanceDeleted(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
+  PlayerId id(render_frame_host, pp_instance);
   UMA_HISTOGRAM_BOOLEAN("Media.Pepper.PlayedSound",
-                        players_played_sound_map_[pp_instance]);
-  players_played_sound_map_.erase(pp_instance);
+                        players_played_sound_map_[id]);
+  players_played_sound_map_.erase(id);
 
-  PepperStopsPlayback(pp_instance);
+  PepperStopsPlayback(render_frame_host, pp_instance);
 }
 
-void PepperPlaybackObserver::PepperStartsPlayback(int32_t pp_instance) {
-  players_played_sound_map_[pp_instance] = true;
+void PepperPlaybackObserver::PepperStartsPlayback(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
+  PlayerId id(render_frame_host, pp_instance);
 
-  if (players_map_.count(pp_instance))
+  players_played_sound_map_[id] = true;
+
+  if (players_map_.count(id))
     return;
 
-  players_map_[pp_instance].reset(new PepperPlayerDelegate(
-      contents_, pp_instance));
+  players_map_[id].reset(new PepperPlayerDelegate(
+      render_frame_host, pp_instance));
 
   MediaSessionImpl::Get(contents_)->AddPlayer(
-      players_map_[pp_instance].get(), PepperPlayerDelegate::kPlayerId,
+      players_map_[id].get(), PepperPlayerDelegate::kPlayerId,
       ShouldDuckFlash() ? media::MediaContentType::Pepper
                         : media::MediaContentType::OneShot);
 }
 
-void PepperPlaybackObserver::PepperStopsPlayback(int32_t pp_instance) {
-  if (!players_map_.count(pp_instance))
+void PepperPlaybackObserver::PepperStopsPlayback(
+    RenderFrameHost* render_frame_host, int32_t pp_instance) {
+  PlayerId id(render_frame_host, pp_instance);
+
+  if (!players_map_.count(id))
     return;
 
   MediaSessionImpl::Get(contents_)->RemovePlayer(
-      players_map_[pp_instance].get(), PepperPlayerDelegate::kPlayerId);
+      players_map_[id].get(), PepperPlayerDelegate::kPlayerId);
 
-  players_map_.erase(pp_instance);
+  players_map_.erase(id);
 }
 
 }  // namespace content