Plumb render view ID to media observer

content/browser/renderer_host/media/audio_renderer_host.cc

Index: content/browser/renderer_host/media/audio_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index c59ef4452b03e4df9ce2c0db6521ea10b1cf2b08..b818f3a91954e5693828ad1c154bf06df88537b9 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -27,9 +27,11 @@ AudioRendererHost::AudioEntry::~AudioEntry() {}
 ///////////////////////////////////////////////////////////////////////////////
 // AudioRendererHost implementations.
 AudioRendererHost::AudioRendererHost(
+    int render_process_id,
     media::AudioManager* audio_manager,
     content::MediaObserver* media_observer)
-    : audio_manager_(audio_manager),
+    : render_process_id_(render_process_id),
+      audio_manager_(audio_manager),
       media_observer_(media_observer) {
 }
 
@@ -192,7 +194,7 @@ bool AudioRendererHost::OnMessageReceived(const IPC::Message& message,
 }
 
 void AudioRendererHost::OnCreateStream(
-    int stream_id, const media::AudioParameters& params) {
+    int render_view_id, int stream_id, const media::AudioParameters& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
@@ -236,8 +238,10 @@ void AudioRendererHost::OnCreateStream(
   // to the map.
   entry->stream_id = stream_id;
   audio_entries_.insert(std::make_pair(stream_id, entry.release()));
-  if (media_observer_)
-    media_observer_->OnSetAudioStreamStatus(this, stream_id, "created");
+  if (media_observer_) {
+    media_observer_->OnSetAudioStreamStatus(
+        this, stream_id, render_process_id_, render_view_id, "created");
+  }
 }
 
 void AudioRendererHost::OnPlayStream(int stream_id) {
@@ -278,15 +282,19 @@ void AudioRendererHost::OnFlushStream(int stream_id) {
   }
 
   entry->controller->Flush();
-  if (media_observer_)
-    media_observer_->OnSetAudioStreamStatus(this, stream_id, "flushed");
+  if (media_observer_) {
+    media_observer_->OnSetAudioStreamStatus(
+        this, stream_id, render_process_id_, 0, "flushed");
+  }
 }
 
 void AudioRendererHost::OnCloseStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  if (media_observer_)
-    media_observer_->OnSetAudioStreamStatus(this, stream_id, "closed");
+  if (media_observer_) {
+    media_observer_->OnSetAudioStreamStatus(
+        this, stream_id, render_process_id_, 0, "closed");
+  }
 
   AudioEntry* entry = LookupById(stream_id);
 
@@ -355,8 +363,10 @@ void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
   // |entry| is destroyed in DeleteEntry().
   SendErrorMessage(entry->stream_id);
 
-  if (media_observer_)
-    media_observer_->OnSetAudioStreamStatus(this, entry->stream_id, "error");
+  if (media_observer_) {
+    media_observer_->OnSetAudioStreamStatus(
+        this, entry->stream_id, render_process_id_, 0, "error");
+  }
   CloseAndDeleteStream(entry);
 }