Remove the AudioManager singleton.

media/audio/audio_input_controller.h

 // Copyright (c) 2011 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
+#include <string>
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/timer.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager_base.h"
 
 // An AudioInputController controls an AudioInputStream and records data
 // from this input stream. It has an important function that it executes
@@ skipping 48 matching lines @@
     virtual uint32 Write(const void* data, uint32 size) = 0;
 
     // Close this synchronous writer.
     virtual void Close() = 0;
   };
 
   // AudioInputController::Create uses the currently registered Factory to
   // create the AudioInputController. Factory is intended for testing.
   class Factory {
    public:
-    virtual AudioInputController* Create(EventHandler* event_handler,
-                                         AudioParameters params) = 0;
+    virtual AudioInputController* Create(
+        AudioManager* audio_manager,
+        EventHandler* event_handler,
+        AudioParameters params) = 0;
    protected:
     virtual ~Factory() {}
   };
 
   virtual ~AudioInputController();
 
   // Factory method for creating an AudioInputController.
   // If successful, an audio input controller thread is created. The audio
   // device will be created on the new thread and when that is done event
   // handler will receive a OnCreated() call.
   static scoped_refptr<AudioInputController> Create(
+      AudioManager* audio_manager,
       EventHandler* event_handler,
       const AudioParameters& params);
 
   // Factory method for creating a low latency audio stream.
   static scoped_refptr<AudioInputController> CreateLowLatency(
+      AudioManager* audio_manager,
       EventHandler* event_handler,
       const AudioParameters& params,
       const std::string& device_id,
       // External synchronous reader for audio controller.
       SyncWriter* sync_writer);
 
   // Sets the factory used by the static method Create. AudioInputController
   // does not take ownership of |factory|. A value of NULL results in an
   // AudioInputController being created directly.
   static void set_factory_for_testing(Factory* factory) { factory_ = factory; }
@@ skipping 22 matching lines @@
  protected:
   // Internal state of the source.
   enum State {
     kEmpty,
     kCreated,
     kRecording,
     kClosed,
     kError
   };
 
-  AudioInputController(EventHandler* handler, SyncWriter* sync_writer);
+  AudioInputController(AudioManager* audio_manager, EventHandler* handler,
+                       SyncWriter* sync_writer);
 
   // The following methods are executed on the audio controller thread.
   void DoCreate(const AudioParameters& params, const std::string& device_id);
   void DoRecord();
   void DoClose();
   void DoReportError(int code);
   void DoReportNoDataError();
   void DoResetNoDataTimer();
 
+  scoped_refptr<AudioManager> audio_manager_;
   EventHandler* handler_;
   AudioInputStream* stream_;
 
   // |no_data_timer_| is used to call DoReportNoDataError when we stop
   // receiving OnData calls without an OnClose call. This can occur when an
   // audio input device is unplugged whilst recording on Windows.
   // See http://crbug.com/79936 for details.
   base::DelayTimer<AudioInputController> no_data_timer_;
 
   // |state_| is written on the audio input controller thread and is read on
@@ skipping 10 matching lines @@
   SyncWriter* sync_writer_;
 
   static Factory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_