Part 1: Plumb render view ID to render host

content/browser/renderer_host/media/audio_renderer_host.cc

 // Copyright (c) 2012 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/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 174 matching lines @@
     IPC_MESSAGE_HANDLER(AudioHostMsg_FlushStream, OnFlushStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_CloseStream, OnCloseStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 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);
 
   media::AudioParameters audio_params(params);
   DCHECK_GT(audio_params.frames_per_buffer(), 0);
 
   uint32 buffer_size = audio_params.GetBytesPerBuffer();
 
   scoped_ptr<AudioEntry> entry(new AudioEntry());
 
@@ skipping 27 matching lines @@
   }
 
   // If we have created the controller successfully, create an entry and add it
   // 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");
 }
 
-void AudioRendererHost::OnPlayStream(int stream_id) {
+void AudioRendererHost::OnPlayStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Play();
   if (media_observer_)
     media_observer_->OnSetAudioStreamPlaying(this, stream_id, true);
 }
 
-void AudioRendererHost::OnPauseStream(int stream_id) {
+void AudioRendererHost::OnPauseStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Pause();
   if (media_observer_)
     media_observer_->OnSetAudioStreamPlaying(this, stream_id, false);
 }
 
-void AudioRendererHost::OnFlushStream(int stream_id) {
+void AudioRendererHost::OnFlushStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Flush();
   if (media_observer_)
     media_observer_->OnSetAudioStreamStatus(this, stream_id, "flushed");
 }
 
-void AudioRendererHost::OnCloseStream(int stream_id) {
+void AudioRendererHost::OnCloseStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (media_observer_)
     media_observer_->OnSetAudioStreamStatus(this, stream_id, "closed");
 
   AudioEntry* entry = LookupById(stream_id);
 
   if (entry)
     CloseAndDeleteStream(entry);
 }
 
-void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
+void AudioRendererHost::OnSetVolume(int render_view_id,
+                                    int stream_id,
+                                    double volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // Make sure the volume is valid.
   if (volume < 0 || volume > 1.0)
@@ skipping 68 matching lines @@
 
   // Iterate the map of entries.
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (!i->second->pending_close && controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }