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

Unified Diff: media/audio/linux/alsa_output_unittest.cc

Issue 10184011: Remove unused parameter "stream" from all variants of OnMoreData(). (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 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/linux/alsa_output.cc ('k') | media/audio/linux/cras_output.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/alsa_output_unittest.cc
===================================================================
--- media/audio/linux/alsa_output_unittest.cc (revision 133451)
+++ media/audio/linux/alsa_output_unittest.cc (working copy)
@@ -69,8 +69,7 @@
class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
public:
- MOCK_METHOD4(OnMoreData, uint32(AudioOutputStream* stream,
- uint8* dest, uint32 max_size,
+ MOCK_METHOD3(OnMoreData, uint32(uint8* dest, uint32 max_size,
AudioBuffersState buffers_state));
MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code));
};
@@ -440,8 +439,7 @@
EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(kFakeHandle, _))
.Times(2)
.WillRepeatedly(DoAll(SetArgumentPointee<1>(0), Return(0)));
- EXPECT_CALL(mock_callback,
- OnMoreData(test_stream, _, kTestPacketSize, _))
+ EXPECT_CALL(mock_callback, OnMoreData(_, kTestPacketSize, _))
.Times(2)
.WillOnce(Return(kTestPacketSize))
.WillOnce(Return(0));
@@ -559,8 +557,7 @@
.WillRepeatedly(Return(0)); // Buffer is full.
// Return a partially filled packet.
- EXPECT_CALL(mock_callback,
- OnMoreData(test_stream, _, _, _))
+ EXPECT_CALL(mock_callback, OnMoreData(_, _, _))
.WillOnce(Return(10));
bool source_exhausted;
@@ -586,7 +583,7 @@
.WillOnce(DoAll(SetArgumentPointee<1>(-1), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
.WillRepeatedly(Return(0)); // Buffer is full.
- EXPECT_CALL(mock_callback, OnMoreData(test_stream, _, _, _))
+ EXPECT_CALL(mock_callback, OnMoreData(_, _, _))
.WillOnce(Return(10));
bool source_exhausted;
@@ -611,7 +608,7 @@
EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
.WillRepeatedly(Return(0)); // Buffer is full.
EXPECT_CALL(mock_callback,
- OnMoreData(test_stream, _, _, AllOf(
+ OnMoreData(_, _, AllOf(
Field(&AudioBuffersState::pending_bytes, 0),
Field(&AudioBuffersState::hardware_delay_bytes, 0))))
.WillOnce(Return(10));
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/linux/cras_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698