Route Pepper MediaSession messages to frames

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 51fc03d2be62dd41a25388af0c52bcea3f76d1e4..1bf9bfab73808f8fc42088b445b801495e26cb04 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3760,13 +3760,15 @@ void WebContentsImpl::OnWebUISend(const GURL& source_url,
 void WebContentsImpl::OnPepperInstanceCreated(int32_t pp_instance) {
   for (auto& observer : observers_)
     observer.PepperInstanceCreated();
-  pepper_playback_observer_->PepperInstanceCreated(pp_instance);
+  pepper_playback_observer_->PepperInstanceCreated(
+      render_frame_message_source_, pp_instance);

[piman, 2016/12/06 21:26:12]

I am somewhat concerned that render_frame_message_source_ refers to a
RenderFrameHost that could get destroyed later, but I don't think we have a
guarantee that OnPepperInstanceDeleted will be called before then (since a
compromised renderer can send - or not send - any message it wants).

Should the PepperPlaybackObserver also track the RenderFrameHost lifetime (e.g.
with a WebContentsObserver)?

[Zhiqiang Zhang (Slow), 2016/12/07 16:36:20]

Thanks for pointing out. Done.

 }
 
 void WebContentsImpl::OnPepperInstanceDeleted(int32_t pp_instance) {
   for (auto& observer : observers_)
     observer.PepperInstanceDeleted();
-  pepper_playback_observer_->PepperInstanceDeleted(pp_instance);
+  pepper_playback_observer_->PepperInstanceDeleted(
+      render_frame_message_source_, pp_instance);
 }
 
 void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,
@@ -3779,11 +3781,13 @@ void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,
 }
 
 void WebContentsImpl::OnPepperStartsPlayback(int32_t pp_instance) {
-  pepper_playback_observer_->PepperStartsPlayback(pp_instance);
+  pepper_playback_observer_->PepperStartsPlayback(
+      render_frame_message_source_, pp_instance);
 }
 
 void WebContentsImpl::OnPepperStopsPlayback(int32_t pp_instance) {
-  pepper_playback_observer_->PepperStopsPlayback(pp_instance);
+  pepper_playback_observer_->PepperStopsPlayback(
+      render_frame_message_source_, pp_instance);
 }
 
 void WebContentsImpl::OnPluginCrashed(const base::FilePath& plugin_path,