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 d03a5d69c413bc3f3d558c35d271bf7c03afed56..22ca35e5adde3f7f5730f046a07907d62562fdc7 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 kRenderProcessId = 1; |
static const int kRenderViewId = -2; |
static bool IsRunningHeadless() { |
@@ -46,7 +47,7 @@ class MockAudioRendererHost : public AudioRendererHost { |
explicit MockAudioRendererHost( |
media::AudioManager* audio_manager, |
content::MediaObserver* media_observer) |
- : AudioRendererHost(audio_manager, media_observer), |
+ : AudioRendererHost(kRenderProcessId, audio_manager, media_observer), |
shared_memory_length_(0) { |
} |
@@ -193,8 +194,8 @@ class AudioRendererHostTest : public testing::Test { |
} |
void Create() { |
- EXPECT_CALL(*observer_, |
- OnSetAudioStreamStatus(_, kStreamId, "created")); |
+ EXPECT_CALL(*observer_, OnSetAudioStreamStatus( |
+ _, kRenderViewId, kStreamId, "created")); |
InSequence s; |
// We will first receive an OnStreamCreated() signal. |
@@ -219,8 +220,8 @@ class AudioRendererHostTest : public testing::Test { |
} |
void Close() { |
- EXPECT_CALL(*observer_, |
- OnSetAudioStreamStatus(_, kStreamId, "closed")); |
+ EXPECT_CALL(*observer_, OnSetAudioStreamStatus( |
+ _, kRenderViewId, kStreamId, "closed")); |
// Send a message to AudioRendererHost to tell it we want to close the |
// stream. |
@@ -230,7 +231,7 @@ class AudioRendererHostTest : public testing::Test { |
void Play() { |
EXPECT_CALL(*observer_, |
- OnSetAudioStreamPlaying(_, kStreamId, true)); |
+ OnSetAudioStreamPlaying(_, kRenderViewId, kStreamId, true)); |
EXPECT_CALL(*host_, OnStreamPlaying(kStreamId)) |
.WillOnce(QuitMessageLoop(message_loop_.get())); |
@@ -239,8 +240,8 @@ class AudioRendererHostTest : public testing::Test { |
} |
void Pause() { |
- EXPECT_CALL(*observer_, |
- OnSetAudioStreamPlaying(_, kStreamId, false)); |
+ EXPECT_CALL(*observer_, OnSetAudioStreamPlaying( |
+ _, kRenderViewId, kStreamId, false)); |
EXPECT_CALL(*host_, OnStreamPaused(kStreamId)) |
.WillOnce(QuitMessageLoop(message_loop_.get())); |
@@ -249,16 +250,16 @@ class AudioRendererHostTest : public testing::Test { |
} |
void SetVolume(double volume) { |
- EXPECT_CALL(*observer_, |
- OnSetAudioStreamVolume(_, kStreamId, volume)); |
+ EXPECT_CALL(*observer_, OnSetAudioStreamVolume( |
+ _, kRenderViewId, kStreamId, volume)); |
host_->OnSetVolume(kStreamId, volume); |
message_loop_->RunAllPending(); |
} |
void SimulateError() { |
- EXPECT_CALL(*observer_, |
- OnSetAudioStreamStatus(_, kStreamId, "error")); |
+ EXPECT_CALL(*observer_, OnSetAudioStreamStatus( |
+ _, kRenderViewId, kStreamId, "error")); |
// Find the first AudioOutputController in the AudioRendererHost. |
CHECK(host_->audio_entries_.size()) |
<< "Calls Create() before calling this method"; |
@@ -270,7 +271,8 @@ class AudioRendererHostTest : public testing::Test { |
EXPECT_CALL(*host_, OnStreamError(kStreamId)); |
// Expect the audio stream will be deleted. |
- EXPECT_CALL(*observer_, OnDeleteAudioStream(_, kStreamId)); |
+ EXPECT_CALL(*observer_, OnDeleteAudioStream( |
+ _, kRenderViewId, kStreamId)); |
// Simulate an error sent from the audio device. |
host_->OnError(controller, 0); |