Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector (Relanding)

media/audio/virtual_audio_input_stream_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 <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/rand_util.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 14 matching lines @@
 
 namespace {
 
 const AudioParameters kParams(
     AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, 8000, 8, 10);
 
 class MockInputCallback : public AudioInputStream::AudioInputCallback {
  public:
   MockInputCallback()
       : data_pushed_(false, false) {
-    ON_CALL(*this, OnData(_, _, _, _, _))
-        .WillByDefault(InvokeWithoutArgs(&data_pushed_,
-                                         &base::WaitableEvent::Signal));
+    ON_CALL(*this, OnData(_, _, _, _)).WillByDefault(
+        InvokeWithoutArgs(&data_pushed_, &base::WaitableEvent::Signal));
   }
 
   virtual ~MockInputCallback() {}
 
-  MOCK_METHOD5(OnData, void(AudioInputStream* stream, const uint8* data,
-                            uint32 size, uint32 hardware_delay_bytes,
-                            double volume));
+  MOCK_METHOD4(OnData,
+               void(AudioInputStream* stream,
+                    const AudioBus* source,
+                    uint32 hardware_delay_bytes,
+                    double volume));
   MOCK_METHOD1(OnError, void(AudioInputStream* stream));
 
   void WaitForDataPushes() {
     for (int i = 0; i < 3; ++i) {
       data_pushed_.Wait();
     }
   }
 
  private:
   base::WaitableEvent data_pushed_;
@@ skipping 51 matching lines @@
 
   void Create() {
     const bool worker_is_separate_thread = GetParam();
     stream_ = new VirtualAudioInputStream(
         kParams, GetWorkerTaskRunner(worker_is_separate_thread),
         base::Bind(&base::DeletePointer<VirtualAudioInputStream>));
     stream_->Open();
   }
 
   void Start() {
-    EXPECT_CALL(input_callback_, OnData(_, NotNull(), _, _, _))
-        .Times(AtLeast(1));
+    EXPECT_CALL(input_callback_, OnData(_, NotNull(), _, _)).Times(AtLeast(1));
 
     ASSERT_TRUE(!!stream_);
     stream_->Start(&input_callback_);
   }
 
   void CreateAndStartOneOutputStream() {
     ASSERT_TRUE(!!stream_);
     AudioOutputStream* const output_stream = new VirtualAudioOutputStream(
         kParams,
         stream_,
@@ skipping 209 matching lines @@
   }
   RUN_ON_AUDIO_THREAD(Close);
   WaitUntilClosed();
 }
 
 INSTANTIATE_TEST_CASE_P(SingleVersusMultithreaded,
                         VirtualAudioInputStreamTest,
                         ::testing::Values(false, true));
 
 }  // namespace media