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

Unified Diff: media/audio/audio_output_controller_unittest.cc

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Comments. Created 8 years, 3 months 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
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller_unittest.cc
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index 6fe24996dd930d183c2f11219ee19f2fc3320861..70edb1418d51c86e8ac40ac43bed5347b751055e 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -52,7 +52,7 @@ class MockAudioOutputControllerSyncReader
MockAudioOutputControllerSyncReader() {}
MOCK_METHOD1(UpdatePendingBytes, void(uint32 bytes));
- MOCK_METHOD2(Read, uint32(void* data, uint32 size));
+ MOCK_METHOD1(Read, int(AudioBus* audio_bus));
MOCK_METHOD0(Close, void());
MOCK_METHOD0(DataReady, bool());
@@ -125,7 +125,7 @@ TEST_F(AudioOutputControllerTest, PlayPauseClose) {
MockAudioOutputControllerSyncReader sync_reader;
EXPECT_CALL(sync_reader, UpdatePendingBytes(_))
.Times(AtLeast(2));
- EXPECT_CALL(sync_reader, Read(_, kHardwareBufferSize))
+ EXPECT_CALL(sync_reader, Read(_))
.WillRepeatedly(DoAll(SignalEvent(&event),
Return(4)));
EXPECT_CALL(sync_reader, DataReady())
@@ -197,7 +197,7 @@ TEST_F(AudioOutputControllerTest, PlayPausePlayClose) {
MockAudioOutputControllerSyncReader sync_reader;
EXPECT_CALL(sync_reader, UpdatePendingBytes(_))
.Times(AtLeast(1));
- EXPECT_CALL(sync_reader, Read(_, kHardwareBufferSize))
+ EXPECT_CALL(sync_reader, Read(_))
.WillRepeatedly(DoAll(SignalEvent(&event), Return(4)));
EXPECT_CALL(sync_reader, DataReady())
.WillRepeatedly(Return(true));
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698