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

Unified Diff: media/audio/linux/cras_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/cras_output.cc ('k') | media/audio/mac/audio_low_latency_output_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/cras_output_unittest.cc
===================================================================
--- media/audio/linux/cras_output_unittest.cc (revision 133451)
+++ media/audio/linux/cras_output_unittest.cc (working copy)
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <string>
+
#include "media/audio/linux/audio_manager_linux.h"
#include "media/audio/linux/cras_output.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -17,8 +19,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));
};
@@ -120,7 +121,7 @@
TEST_F(CrasOutputStreamTest, ConstructedState) {
// Should support mono.
- CrasOutputStream *test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
+ CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
EXPECT_EQ(CrasOutputStream::kCreated, test_stream->state());
test_stream->Close();
@@ -154,7 +155,7 @@
}
TEST_F(CrasOutputStreamTest, OpenClose) {
- CrasOutputStream *test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
+ CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
// Open the stream.
ASSERT_TRUE(test_stream->Open());
EXPECT_EQ(CrasOutputStream::kIsOpened, test_stream->state());
@@ -164,7 +165,7 @@
}
TEST_F(CrasOutputStreamTest, StartFailBeforeOpen) {
- CrasOutputStream *test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
+ CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
MockAudioSourceCallback mock_callback;
test_stream->Start(&mock_callback);
@@ -172,7 +173,7 @@
}
TEST_F(CrasOutputStreamTest, StartStop) {
- CrasOutputStream *test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
+ CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
MockAudioSourceCallback mock_callback;
// Open the stream.
@@ -192,7 +193,7 @@
}
TEST_F(CrasOutputStreamTest, RenderFrames) {
- CrasOutputStream *test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
+ CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
MockAudioSourceCallback mock_callback;
const uint32 amount_rendered_return = 2048;
@@ -201,7 +202,7 @@
EXPECT_EQ(CrasOutputStream::kIsOpened, test_stream->state());
// Render Callback.
- EXPECT_CALL(mock_callback, OnMoreData(test_stream, _,
+ EXPECT_CALL(mock_callback, OnMoreData(_,
kTestFramesPerPacket * kTestBytesPerFrame, _))
.WillRepeatedly(Return(amount_rendered_return));
« no previous file with comments | « media/audio/linux/cras_output.cc ('k') | media/audio/mac/audio_low_latency_output_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698