Revert 57254 - Share one thread between all AudioOutputControllers instead of...

media/audio/linux/audio_manager_linux.h

Index: media/audio/linux/audio_manager_linux.h
===================================================================
--- media/audio/linux/audio_manager_linux.h	(revision 57255)
+++ media/audio/linux/audio_manager_linux.h	(working copy)
@@ -11,12 +11,12 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_io.h"
 
 class AlsaPcmOutputStream;
 class AlsaWrapper;
 
-class AudioManagerLinux : public AudioManagerBase {
+class AudioManagerLinux : public AudioManager {
  public:
   AudioManagerLinux();
 
@@ -44,12 +44,17 @@
   virtual ~AudioManagerLinux();
 
  private:
+  // Thread used to interact with AudioOutputStreams created by this
+  // audio manger.
+  base::Thread audio_thread_;
   scoped_ptr<AlsaWrapper> wrapper_;
 
   Lock lock_;
   std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> >
       active_streams_;
 
+  bool initialized_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
 };