Revert 290359 "Remove AudioBuffersState class."

trunk/src/media/audio/audio_low_latency_input_output_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/synchronization/lock.h"
@@ skipping 208 matching lines @@
     // enough to handle the current sample test scenario.
     //   buffer_->set_forward_capacity(2 * buffer_->forward_capacity());
     //   buffer_->Clear();
     // }
   }
 
   virtual void OnError(AudioInputStream* stream) OVERRIDE {}
 
   // AudioOutputStream::AudioSourceCallback.
   virtual int OnMoreData(AudioBus* audio_bus,
-                         int total_bytes_delay) OVERRIDE {
+                         AudioBuffersState buffers_state) OVERRIDE {
     base::AutoLock lock(lock_);
 
     // Update one component in the AudioDelayState for the packet
     // which is about to be played out.
     if (output_elements_to_write_ < kMaxDelayMeasurements) {
+      int output_delay_bytes = buffers_state.hardware_delay_bytes;
+#if defined(OS_WIN)
+      // Special fix for Windows in combination with Wave where the
+      // pending bytes field of the audio buffer state is used to
+      // report the delay.
+      if (!CoreAudioUtil::IsSupported()) {
+        output_delay_bytes = buffers_state.pending_bytes;
+      }
+#endif
       delay_states_[output_elements_to_write_].output_delay_ms =
-          BytesToMilliseconds(total_bytes_delay);
+          BytesToMilliseconds(output_delay_bytes);
       ++output_elements_to_write_;
     }
 
     int size;
     const uint8* source;
     // Read the data from the seekable media buffer which contains
     // captured data at the same size and sample rate as the output side.
     if (buffer_->GetCurrentChunk(&source, &size) && size > 0) {
       EXPECT_EQ(channels_, audio_bus->channels());
       size = std::min(audio_bus->frames() * frame_size_, size);
@@ skipping 190 matching lines @@
 
   // All Close() operations that run on the mocked audio thread,
   // should be synchronous and not post additional close tasks to
   // mocked the audio thread. Hence, there is no need to call
   // message_loop()->RunUntilIdle() after the Close() methods.
   aos->Close();
   ais->Close();
 }
 
 }  // namespace media