Revert 277794 "Modifies AudioInputCallback::OnData and use media..."

trunk/src/media/audio/virtual_audio_input_stream_unittest.cc

Index: trunk/src/media/audio/virtual_audio_input_stream_unittest.cc
===================================================================
--- trunk/src/media/audio/virtual_audio_input_stream_unittest.cc	(revision 277811)
+++ trunk/src/media/audio/virtual_audio_input_stream_unittest.cc	(working copy)
@@ -32,17 +32,16 @@
  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_METHOD4(OnData,
-               void(AudioInputStream* stream,
-                    const AudioBus* source,
-                    uint32 hardware_delay_bytes,
-                    double volume));
+  MOCK_METHOD5(OnData, void(AudioInputStream* stream, const uint8* data,
+                            uint32 size, uint32 hardware_delay_bytes,
+                            double volume));
   MOCK_METHOD1(OnError, void(AudioInputStream* stream));
 
   void WaitForDataPushes() {
@@ -114,7 +113,8 @@
   }
 
   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_);