Tab Audio Mirroring: WebContentsAudioInputStream is a new implementation which represents the lifet…

media/audio/virtual_audio_input_stream.h

Index: media/audio/virtual_audio_input_stream.h
diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h
index fcb87a4db10bd58955a988f492ee6fa4ff7cf5d1..7a9b7da0089b166d9ed026f94811fb38645711e7 100644
--- a/media/audio/virtual_audio_input_stream.h
+++ b/media/audio/virtual_audio_input_stream.h
@@ -12,10 +12,13 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_io.h"
-#include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/audio_converter.h"
 
+namespace base {
+class MessageLoopProxy;
+}
+
 namespace media {
 
 class LoopbackAudioConverter;
@@ -26,13 +29,15 @@ class VirtualAudioOutputStream;
 // audio until this VirtualAudioInputStream is stopped and closed.
 class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream {
  public:
-  static VirtualAudioInputStream* MakeStream(
-      AudioManagerBase* manager,
-      const AudioParameters& params,
-      base::MessageLoopProxy* message_loop);
+  // Construct a target for audio loopback which mixes multiple data streams
+  // into a single stream having the given |params|.
+  VirtualAudioInputStream(const AudioParameters& params,
+                          base::MessageLoopProxy* message_loop);
 
   virtual ~VirtualAudioInputStream();
 
+  void RunOnceClosed(const base::Closure& on_close_cb);
+
   // AudioInputStream:
   virtual bool Open() OVERRIDE;
   virtual void Start(AudioInputCallback* callback) OVERRIDE;
@@ -55,28 +60,24 @@ class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream {
   virtual void RemoveOutputStream(VirtualAudioOutputStream* stream,
                                   const AudioParameters& output_params);
 
- protected:
+ private:
   friend class VirtualAudioInputStreamTest;
-  FRIEND_TEST_ALL_PREFIXES(AudioOutputControllerTest,
-                           VirtualStreamsTriggerDeviceChange);
 
   typedef std::map<AudioParameters, LoopbackAudioConverter*> AudioConvertersMap;
 
-  VirtualAudioInputStream(AudioManagerBase* manager,
-                          const AudioParameters& params,
-                          base::MessageLoopProxy* message_loop);
-
   // When Start() is called on this class, we continuously schedule this
   // callback to render audio using any attached VirtualAudioOutputStreams until
   // Stop() is called.
   void ReadAudio();
 
-  AudioManagerBase* audio_manager_;
-  base::MessageLoopProxy* message_loop_;
+  base::MessageLoopProxy* const message_loop_;
+
+  base::Closure on_close_cb_;
+
   AudioInputCallback* callback_;
 
   // Non-const for testing.
-  base::TimeDelta buffer_duration_ms_;
+  base::TimeDelta buffer_duration_;
   scoped_array<uint8> buffer_;
   AudioParameters params_;
   scoped_ptr<AudioBus> audio_bus_;
@@ -91,7 +92,7 @@ class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream {
   AudioConverter mixer_;
 
   // Number of currently attached VirtualAudioOutputStreams.
-  int num_attached_outputs_streams_;
+  int num_attached_output_streams_;
 
   DISALLOW_COPY_AND_ASSIGN(VirtualAudioInputStream);
 };