Part 1: Plumb render view ID to render host

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Index: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 62c09bf140f184d92e230cd648260c553e0baf3f..fa1f9c531b42e9b8f29718392952a38cd725fa5f 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -32,6 +32,7 @@ using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 static const int kStreamId = 50;
+static const int kRenderViewId = -2;
 
 static bool IsRunningHeadless() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
@@ -213,7 +214,7 @@ class AudioRendererHostTest : public testing::Test {
 
     // Send a create stream message to the audio output stream and wait until
     // we receive the created message.
-    host_->OnCreateStream(kStreamId, params);
+    host_->OnCreateStream(kRenderViewId, kStreamId, params);
     message_loop_->Run();
   }
 
@@ -223,7 +224,7 @@ class AudioRendererHostTest : public testing::Test {
 
     // Send a message to AudioRendererHost to tell it we want to close the
     // stream.
-    host_->OnCloseStream(kStreamId);
+    host_->OnCloseStream(kRenderViewId, kStreamId);
     message_loop_->RunAllPending();
   }
 
@@ -233,7 +234,7 @@ class AudioRendererHostTest : public testing::Test {
     EXPECT_CALL(*host_, OnStreamPlaying(kStreamId))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
 
-    host_->OnPlayStream(kStreamId);
+    host_->OnPlayStream(kRenderViewId, kStreamId);
     message_loop_->Run();
   }
 
@@ -243,7 +244,7 @@ class AudioRendererHostTest : public testing::Test {
     EXPECT_CALL(*host_, OnStreamPaused(kStreamId))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
 
-    host_->OnPauseStream(kStreamId);
+    host_->OnPauseStream(kRenderViewId, kStreamId);
     message_loop_->Run();
   }
 
@@ -251,7 +252,7 @@ class AudioRendererHostTest : public testing::Test {
     EXPECT_CALL(*observer_,
                 OnSetAudioStreamVolume(_, kStreamId, volume));
 
-    host_->OnSetVolume(kStreamId, volume);
+    host_->OnSetVolume(kRenderViewId, kStreamId, volume);
     message_loop_->RunAllPending();
   }