Switch OnMoreData() to use AudioBus.

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_METHOD3(OnMoreData, uint32(uint8* dest, uint32 max_size,
-                                  AudioBuffersState buffers_state));
+  MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus,
+                               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_METHOD1(MakeLinearOutputStream, AudioOutputStream*(
       const AudioParameters& params));
@@ skipping 152 matching lines @@
   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);
   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(_,
-          kTestFramesPerPacket * kTestBytesPerFrame, _))
-      .WillRepeatedly(Return(amount_rendered_return));
+  EXPECT_CALL(mock_callback, OnMoreData(_, _))
+      .WillRepeatedly(Return(kTestFramesPerPacket));
 
   // 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