Remove unused parameter "stream" from all variants of OnMoreData().

media/audio/linux/cras_output_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
 
 namespace media {
 
 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));
 };
 
 class MockAudioManagerLinux : public AudioManagerLinux {
  public:
   MOCK_METHOD0(Init, void());
   MOCK_METHOD0(HasAudioOutputDevices, bool());
   MOCK_METHOD0(HasAudioInputDevices, bool());
   MOCK_METHOD0(MuteAll, void());
@@ skipping 81 matching lines @@
     CrasOutputStreamTest::kTestBytesPerFrame;
 struct cras_audio_format* const CrasOutputStreamTest::kFakeAudioFormat =
     reinterpret_cast<struct cras_audio_format*>(1);
 struct cras_stream_params* const CrasOutputStreamTest::kFakeStreamParams =
     reinterpret_cast<struct cras_stream_params*>(1);
 struct cras_client* const CrasOutputStreamTest::kFakeClient =
     reinterpret_cast<struct cras_client*>(1);
 
 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();
 
   // Should support stereo.
   test_stream = CreateStream(CHANNEL_LAYOUT_SURROUND);
   EXPECT_EQ(CrasOutputStream::kCreated, test_stream->state());
   test_stream->Close();
 
   // Bad bits per sample.
   AudioParameters bad_bps_params(kTestFormat, kTestChannelLayout,
@@ skipping 13 matching lines @@
 
   // Bad sample rate.
   AudioParameters bad_rate_params(kTestFormat, kTestChannelLayout,
                                   0, kTestBitsPerSample, kTestFramesPerPacket);
   test_stream = new CrasOutputStream(bad_rate_params, mock_manager_.get());
   EXPECT_EQ(CrasOutputStream::kInError, test_stream->state());
   test_stream->Close();
 }
 
 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());
 
   // Close the stream.
   test_stream->Close();
 }
 
 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);
   EXPECT_EQ(CrasOutputStream::kInError, test_stream->state());
 }
 
 TEST_F(CrasOutputStreamTest, StartStop) {
-  CrasOutputStream *test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
+  CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
   MockAudioSourceCallback mock_callback;
 
   // Open the stream.
   ASSERT_TRUE(test_stream->Open());
   EXPECT_EQ(CrasOutputStream::kIsOpened, test_stream->state());
 
   // Start.
   test_stream->Start(&mock_callback);
   EXPECT_EQ(CrasOutputStream::kIsPlaying, test_stream->state());
 
   // Stop.
   test_stream->Stop();
   EXPECT_EQ(CrasOutputStream::kIsStopped, test_stream->state());
 
   // Close the stream.
   test_stream->Close();
 }
 
 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;
 
   // Open the stream.
   ASSERT_TRUE(test_stream->Open());
   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));
 
   // Start.
   test_stream->Start(&mock_callback);
   EXPECT_EQ(CrasOutputStream::kIsPlaying, test_stream->state());
 
   // Stop.
   test_stream->Stop();
   EXPECT_EQ(CrasOutputStream::kIsStopped, test_stream->state());
 
   // Close the stream.
   test_stream->Close();
 }
 
 }  // namespace media