Revert 290359 "Remove AudioBuffersState class."

Broke ChromeOS bots
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/70835/steps/compile/logs/stdio#error1

> Remove AudioBuffersState class.
> 
> The AudioBuffersState object doesn't appear to be necessary anymore.
> Most code either completely ignores this information or doesn't actually
> care about the difference between pending_bytes and hardware_delay_bytes.
> Also usually only one of the 2 fields was actually being used at a time.
> This change removes the class and simply uses an int that represent the
> total number of delay bytes.
> 
> BUG=125685
> 
> Review URL: https://codereview.chromium.org/467833002

TBR=acolwell@chromium.org

Review URL: https://codereview.chromium.org/487543002

Cr-Commit-Position: refs/heads/master@{#290376}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290376 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index d333237..177953d 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -123,7 +123,7 @@ static void CheckDeviceNames(const AudioDeviceNames& device_names) {
 }
 
 // We clear the data bus to ensure that the test does not cause noise.
-static int RealOnMoreData(AudioBus* dest, int total_bytes_delay) {
+static int RealOnMoreData(AudioBus* dest, AudioBuffersState buffers_state) {
   dest->Zero();
   return dest->frames();
 }
@@ -178,7 +178,7 @@ class FileAudioSource : public AudioOutputStream::AudioSourceCallback {
   // Use samples read from a data file and fill up the audio buffer
   // provided to us in the callback.
   virtual int OnMoreData(AudioBus* audio_bus,
-                         int total_bytes_delay) OVERRIDE {
+                         AudioBuffersState buffers_state) OVERRIDE {
     bool stop_playing = false;
     int max_size =
         audio_bus->frames() * audio_bus->channels() * kBytesPerSample;
@@ -354,7 +354,7 @@ class FullDuplexAudioSinkSource
 
   // AudioOutputStream::AudioSourceCallback implementation
   virtual int OnMoreData(AudioBus* dest,
-                         int total_bytes_delay) OVERRIDE {
+                         AudioBuffersState buffers_state) OVERRIDE {
     const int size_in_bytes =
         (params_.bits_per_sample() / 8) * dest->frames() * dest->channels();
     EXPECT_EQ(size_in_bytes, params_.GetBytesPerBuffer());
diff --git a/media/audio/android/opensles_output.cc b/media/audio/android/opensles_output.cc
index 4ac0af2..41c03c7 100644
--- a/media/audio/android/opensles_output.cc
+++ b/media/audio/android/opensles_output.cc
@@ -326,7 +326,7 @@ void OpenSLESOutputStream::FillBufferQueueNoLock() {
   // delay estimation.
   const uint32 hardware_delay = buffer_size_bytes_;
   int frames_filled = callback_->OnMoreData(
-      audio_bus_.get(), hardware_delay);
+      audio_bus_.get(), AudioBuffersState(0, hardware_delay));
   if (frames_filled <= 0) {
     // Audio source is shutting down, or halted on error.
     return;