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

content/browser/media/capture/web_contents_audio_input_stream_unittest.cc

 // Copyright (c) 2013 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 "content/browser/media/capture/web_contents_audio_input_stream.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 143 matching lines @@
   VirtualAudioInputStream real_;
   bool real_stream_is_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(MockVirtualAudioInputStream);
 };
 
 class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
  public:
   MockAudioInputCallback() {}
 
-  MOCK_METHOD5(OnData, void(AudioInputStream* stream, const uint8* src,
-                            uint32 size, uint32 hardware_delay_bytes,
-                            double volume));
+  MOCK_METHOD4(OnData,
+               void(AudioInputStream* stream,
+                    const media::AudioBus* src,
+                    uint32 hardware_delay_bytes,
+                    double volume));
   MOCK_METHOD1(OnError, void(AudioInputStream* stream));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioInputCallback);
 };
 
 }  // namespace
 
 class WebContentsAudioInputStreamTest : public testing::Test {
  public:
@@ skipping 54 matching lines @@
         .WillOnce(SaveArg<2>(&destination_))
         .RetiresOnSaturation();
     // At Stop() time, or when the mirroring target changes:
     EXPECT_CALL(*mock_mirroring_manager_,
                 StopMirroring(kRenderProcessId, kRenderViewId, NotNull()))
         .WillOnce(Assign(
             &destination_,
             static_cast<AudioMirroringManager::MirroringDestination*>(NULL)))
         .RetiresOnSaturation();
 
-    EXPECT_CALL(mock_input_callback_, OnData(NotNull(), NotNull(), _, _, _))
+    EXPECT_CALL(mock_input_callback_, OnData(NotNull(), NotNull(), _, _))
         .WillRepeatedly(
             InvokeWithoutArgs(&on_data_event_, &base::WaitableEvent::Signal));
 
     wcais_->Start(&mock_input_callback_);
 
     // Test plumbing of volume controls and automatic gain controls.  Calls to
     // wcais_ methods should delegate directly to mock_vais_.
     EXPECT_CALL(*mock_vais_, GetVolume());
     double volume = wcais_->GetVolume();
     EXPECT_CALL(*mock_vais_, GetMaxVolume());
@@ skipping 250 matching lines @@
   WaitForData();
   RUN_ON_AUDIO_THREAD(RemoveOneInputInFIFOOrder);
   WaitForData();
   RUN_ON_AUDIO_THREAD(ChangeMirroringTarget);
   RUN_ON_AUDIO_THREAD(RemoveOneInputInFIFOOrder);
   RUN_ON_AUDIO_THREAD(Stop);
   RUN_ON_AUDIO_THREAD(Close);
 }
 
 }  // namespace content