Revert 290359 "Remove AudioBuffersState class."

trunk/src/media/audio/audio_output_controller.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_AUDIO_OUTPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 
 #include "base/atomic_ref_count.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ skipping 131 matching lines @@
   // Changing the output device causes the controller to go through
   // the same state transition back to the current state as a call to
   // OnDeviceChange (unless it is currently diverting, see
   // Start/StopDiverting below, in which case the state transition
   // will happen when StopDiverting is called).
   void SwitchOutputDevice(const std::string& output_device_id,
                           const base::Closure& callback);
 
   // AudioSourceCallback implementation.
   virtual int OnMoreData(AudioBus* dest,
-                         int total_bytes_delay) OVERRIDE;
+                         AudioBuffersState buffers_state) OVERRIDE;
   virtual void OnError(AudioOutputStream* stream) OVERRIDE;
 
   // AudioDeviceListener implementation.  When called AudioOutputController will
   // shutdown the existing |stream_|, transition to the kRecreating state,
   // create a new stream, and then transition back to an equivalent state prior
   // to being called.
   virtual void OnDeviceChange() OVERRIDE;
 
   // AudioSourceDiverter implementation.
   virtual const AudioParameters& GetAudioParameters() OVERRIDE;
@@ skipping 80 matching lines @@
   // Flags when we've asked for a stream to start but it never did.
   base::AtomicRefCount on_more_io_data_called_;
   scoped_ptr<base::OneShotTimer<AudioOutputController> > wedge_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_