Remove the AudioManager singleton.

content/browser/speech/speech_input_browsertest.cc

Index: content/browser/speech/speech_input_browsertest.cc
===================================================================
--- content/browser/speech/speech_input_browsertest.cc	(revision 113173)
+++ content/browser/speech/speech_input_browsertest.cc	(working copy)
@@ -49,16 +49,13 @@
   }
 
   // SpeechInputManager methods.
-  virtual void StartRecognition(Delegate* delegate,
-                                int caller_id,
-                                int render_process_id,
-                                int render_view_id,
-                                const gfx::Rect& element_rect,
-                                const std::string& language,
-                                const std::string& grammar,
-                                const std::string& origin_url,
-                                net::URLRequestContextGetter* context_getter,
-                                SpeechInputPreferences* speech_input_prefs) {
+  virtual void StartRecognition(Delegate* delegate, int caller_id,
+      int render_process_id, int render_view_id, const gfx::Rect& element_rect,
+      const std::string& language, const std::string& grammar,
+      const std::string& origin_url,
+      net::URLRequestContextGetter* context_getter,
+      SpeechInputPreferences* speech_input_prefs,
+      AudioManager* audio_manager) OVERRIDE {
     VLOG(1) << "StartRecognition invoked.";
     EXPECT_EQ(0, caller_id_);
     EXPECT_EQ(NULL, delegate_);
@@ -77,18 +74,18 @@
           base::Unretained(this)));
     }
   }
-  virtual void CancelRecognition(int caller_id) {
+  virtual void CancelRecognition(int caller_id) OVERRIDE {
     VLOG(1) << "CancelRecognition invoked.";
     EXPECT_EQ(caller_id_, caller_id);
     caller_id_ = 0;
     delegate_ = NULL;
   }
-  virtual void StopRecording(int caller_id) {
+  virtual void StopRecording(int caller_id) OVERRIDE {
     VLOG(1) << "StopRecording invoked.";
     EXPECT_EQ(caller_id_, caller_id);
     // Nothing to do here since we aren't really recording.
   }
-  virtual void CancelAllRequestsWithDelegate(Delegate* delegate) {
+  virtual void CancelAllRequestsWithDelegate(Delegate* delegate) OVERRIDE {
     VLOG(1) << "CancelAllRequestsWithDelegate invoked.";
     // delegate_ is set to NULL if a fake result was received (see below), so
     // check that delegate_ matches the incoming parameter only when there is
@@ -99,22 +96,19 @@
 
  protected:
   virtual void GetRequestInfo(bool* can_report_metrics,
-                              std::string* request_info) {}
-  virtual void ShowRecognitionRequested(int caller_id,
-                                        int render_process_id,
-                                        int render_view_id,
-                                        const gfx::Rect& element_rect) {}
-  virtual void ShowWarmUp(int caller_id) {}
-  virtual void ShowRecognizing(int caller_id) {}
-  virtual void ShowRecording(int caller_id)  {}
-  virtual void ShowInputVolume(int caller_id,
-                               float volume,
-                               float noise_volume) {}
+      std::string* request_info) OVERRIDE {}
+  virtual void ShowRecognitionRequested(int caller_id, int render_process_id,
+      int render_view_id, const gfx::Rect& element_rect) OVERRIDE {}
+  virtual void ShowWarmUp(int caller_id) OVERRIDE {}
+  virtual void ShowRecognizing(int caller_id) OVERRIDE {}
+  virtual void ShowRecording(int caller_id) OVERRIDE {}
+  virtual void ShowInputVolume(int caller_id, float volume,
+      float noise_volume) OVERRIDE {}
   virtual void ShowMicError(int caller_id,
-                            SpeechInputManager::MicError error) {}
+      SpeechInputManager::MicError error) OVERRIDE {}
   virtual void ShowRecognizerError(int caller_id,
-                                   content::SpeechInputError error) {}
-  virtual void DoClose(int caller_id) {}
+      content::SpeechInputError error) OVERRIDE {}
+  virtual void DoClose(int caller_id) OVERRIDE {}
 
  private:
   void SetFakeRecognitionResult() {