Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1761)

Unified Diff: media/audio/audio_output_device_unittest.cc

Issue 2517503003: Reland: Make more media APIs aware of |delay| and |delay_timestamp| (Closed)
Patch Set: Fixed speech synthesis on Chrome OS Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/audio_output_device_unittest.cc
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 70a9b3902b8a4bb4ae0164c4a98aadde174eb33b..681de252410a7f232ccd4b0a31c2f9be020a41f3 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -53,10 +53,11 @@ class MockRenderCallback : public AudioRendererSink::RenderCallback {
MockRenderCallback() {}
virtual ~MockRenderCallback() {}
- MOCK_METHOD3(Render,
- int(AudioBus* dest,
- uint32_t frames_delayed,
- uint32_t frames_skipped));
+ MOCK_METHOD4(Render,
+ int(base::TimeDelta delay,
+ base::TimeTicks timestamp,
+ int prior_frames_skipped,
+ AudioBus* dest));
MOCK_METHOD0(OnRenderError, void());
};
@@ -228,7 +229,6 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
// to provide some audio data that AudioOutputDevice then writes into the
// shared memory section.
const int kMemorySize = CalculateMemorySize();
-
EXPECT_CALL(*audio_output_ipc_, PlayStream())
.WillOnce(SendPendingBytes(&browser_socket_, kMemorySize));
@@ -240,7 +240,7 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
// So, for the sake of this test, we consider the call to Render a sign
// of success and quit the loop.
const int kNumberOfFramesToProcess = 0;
- EXPECT_CALL(callback_, Render(_, _, _))
+ EXPECT_CALL(callback_, Render(_, _, _, _))
.WillOnce(DoAll(QuitLoop(io_loop_.task_runner()),
Return(kNumberOfFramesToProcess)));
}

Powered by Google App Engine
This is Rietveld 408576698