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

trunk/src/media/audio/mac/audio_input_mac.h

 // 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.
 
 #ifndef MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_
 #define MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_
 
 #include <AudioToolbox/AudioFormat.h>
 #include <AudioToolbox/AudioQueue.h>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
 namespace media {
 
-class AudioBus;
 class AudioManagerMac;
 
 // Implementation of AudioInputStream for Mac OS X using the audio queue service
 // present in OS 10.5 and later. Design reflects PCMQueueOutAudioOutputStream.
 class PCMQueueInAudioInputStream : public AudioInputStream {
  public:
   // Parameters as per AudioManager::MakeAudioInputStream.
   PCMQueueInAudioInputStream(AudioManagerMac* manager,
                              const AudioParameters& params);
   virtual ~PCMQueueInAudioInputStream();
@@ skipping 47 matching lines @@
   AudioQueueRef audio_queue_;
   // Size of each of the buffers in |audio_buffers_|
   uint32 buffer_size_bytes_;
   // True iff Start() has been called successfully.
   bool started_;
   // Used to determine if we need to slow down |callback_| calls.
   base::TimeTicks last_fill_;
   // Used to defer Start() to workaround http://crbug.com/160920.
   base::CancelableClosure deferred_start_cb_;
 
-  scoped_ptr<media::AudioBus> audio_bus_;
-
   DISALLOW_COPY_AND_ASSIGN(PCMQueueInAudioInputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_