Improve input handling for WaveAudioHandler.

media/audio/sounds/audio_stream_handler.h

Index: media/audio/sounds/audio_stream_handler.h
diff --git a/media/audio/sounds/audio_stream_handler.h b/media/audio/sounds/audio_stream_handler.h
index f814aaef5993b793052fd54bf80105f8c634d57e..4caa6031d3e80388a8cafdb631a6734567f8633d 100644
--- a/media/audio/sounds/audio_stream_handler.h
+++ b/media/audio/sounds/audio_stream_handler.h
@@ -9,9 +9,9 @@
 #include "base/compiler_specific.h"
 #include "base/strings/string_piece.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/time/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
-#include "media/audio/sounds/wav_audio_handler.h"
 #include "media/base/media_export.h"
 
 namespace media {
@@ -53,7 +53,8 @@ class MEDIA_EXPORT AudioStreamHandler : public base::NonThreadSafe {
   // Stops current playback.
   void Stop();
 
-  const WavAudioHandler& wav_audio_handler() const { return wav_audio_; }
+  // Get the duration of the WAV data passed in.
+  base::TimeDelta duration() const;
 
  private:
   friend class AudioStreamHandlerTest;
@@ -65,11 +66,9 @@ class MEDIA_EXPORT AudioStreamHandler : public base::NonThreadSafe {
   static void SetAudioSourceForTesting(
       AudioOutputStream::AudioSourceCallback* source);
 
-  WavAudioHandler wav_audio_;
+  base::TimeDelta duration_;
   scoped_ptr<AudioStreamContainer> stream_;
 
-  bool initialized_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioStreamHandler);
 };