Reimplement the AlsaPcmOutputStream and fix the threading issues.

media/audio/linux/audio_manager_linux.h

Index: media/audio/linux/audio_manager_linux.h
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 191e6870f54ea1db1f1f290e3b9f14f883d70c12..d33c1a4b84593a50ffd6ac5a44f270240ccaf5ee 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -5,13 +5,23 @@
 #ifndef MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
 #define MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
 
+#include <map>
+
+#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "media/audio/audio_output.h"
 
+class AlsaPcmOutputStream;
+class AlsaWrapper;
+
 class AudioManagerLinux : public AudioManager {
  public:
   AudioManagerLinux();
 
+  // Call before using a newly created AudioManagerLinux instance.
+  void Init();
+
   // Implementation of AudioManager.
   virtual bool HasAudioDevices();
   virtual AudioOutputStream* MakeAudioStream(Format format, int channels,
@@ -25,6 +35,16 @@ class AudioManagerLinux : public AudioManager {
   friend void DestroyAudioManagerLinux(void*);
   virtual ~AudioManagerLinux();
 
+  // Thread used to interact with AudioOutputStreams created by this
+  // audio manger.
+  base::Thread audio_thread_;
+  scoped_ptr<AlsaWrapper> wrapper_;
+
+  std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> >
+      active_streams_;
+
+  bool initialized_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
 };