Remove the AudioManager singleton.

content/browser/speech/speech_input_browsertest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 31 matching lines @@
 
   bool did_cancel_all() {
     return did_cancel_all_;
   }
 
   void set_send_fake_response(bool send) {
     send_fake_response_ = send;
   }
 
   // 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_);
     caller_id_ = caller_id;
     delegate_ = delegate;
     grammar_ = grammar;
     if (send_fake_response_) {
       // Give the fake result in a short while.
       MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
           &FakeSpeechInputManager::SetFakeRecognitionResult,
           // This class does not need to be refcounted (typically done by
           // PostTask) since it will outlive the test and gets released only
           // when the test shuts down. Disabling refcounting here saves a bit
           // of unnecessary code and the factory method can return a plain
           // pointer below as required by the real code.
           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
     // no fake result sent.
     EXPECT_TRUE(send_fake_response_ || delegate_ == delegate);
     did_cancel_all_ = true;
   }
 
  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() {
     if (caller_id_) {  // Do a check in case we were cancelled..
       VLOG(1) << "Setting fake recognition result.";
       delegate_->DidCompleteRecording(caller_id_);
       content::SpeechInputResult results;
       results.hypotheses.push_back(content::SpeechInputHypothesis(
           ASCIIToUTF16(kTestResult), 1.0));
       delegate_->SetRecognitionResult(caller_id_, results);
@@ skipping 125 matching lines @@
 
   // Make the renderer crash. This should trigger SpeechInputDispatcherHost to
   // cancel all pending sessions.
   GURL test_url("about:crash");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   EXPECT_TRUE(fake_speech_input_manager_.did_cancel_all());
 }
 
 }  // namespace speech_input