Remove the AudioManager singleton.

content/browser/speech/speech_input_dispatcher_host.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 "content/browser/speech/speech_input_dispatcher_host.h"
 
 #include "base/lazy_instance.h"
 #include "content/browser/speech/speech_input_preferences.h"
 #include "content/common/speech_input_messages.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 96 matching lines @@
 
 SpeechInputManager* SpeechInputDispatcherHost::manager_;
 
 void SpeechInputDispatcherHost::set_manager(SpeechInputManager* manager) {
   manager_ = manager;
 }
 
 SpeechInputDispatcherHost::SpeechInputDispatcherHost(
     int render_process_id,
     net::URLRequestContextGetter* context_getter,
-    SpeechInputPreferences* speech_input_preferences)
+    SpeechInputPreferences* speech_input_preferences,
+    AudioManager* audio_manager)
     : render_process_id_(render_process_id),
       may_have_pending_requests_(false),
       context_getter_(context_getter),
-      speech_input_preferences_(speech_input_preferences) {
+      speech_input_preferences_(speech_input_preferences),
+      audio_manager_(audio_manager) {
   // This is initialized by Browser. Do not add any non-trivial
   // initialization here, instead do it lazily when required (e.g. see the
   // method |manager()|) or add an Init() method.
 }
 
 SpeechInputDispatcherHost::~SpeechInputDispatcherHost() {
   // If the renderer crashed for some reason or if we didn't receive a proper
   // Cancel/Stop call for an existing session, cancel such active sessions now.
   // We first check if this dispatcher received any speech IPC requst so that
   // we don't end up creating the speech input manager for web pages which don't
@@ skipping 21 matching lines @@
     IPC_MESSAGE_HANDLER(SpeechInputHostMsg_StopRecording,
                         OnStopRecording)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   if (handled)
     may_have_pending_requests_ = true;
   return handled;
 }
 
 void SpeechInputDispatcherHost::OnStartRecognition(
-    const SpeechInputHostMsg_StartRecognition_Params &params) {
+    const SpeechInputHostMsg_StartRecognition_Params& params) {
   int caller_id = g_speech_input_callers.Get().CreateId(
       render_process_id_, params.render_view_id, params.request_id);
+
   manager()->StartRecognition(this, caller_id,
                               render_process_id_,
                               params.render_view_id, params.element_rect,
                               params.language, params.grammar,
                               params.origin_url,
                               context_getter_.get(),
-                              speech_input_preferences_.get());
+                              speech_input_preferences_.get(),
+                              audio_manager_.get());
 }
 
 void SpeechInputDispatcherHost::OnCancelRecognition(int render_view_id,
                                                     int request_id) {
   int caller_id = g_speech_input_callers.Get().GetId(
       render_process_id_, render_view_id, request_id);
   if (caller_id) {
     manager()->CancelRecognition(caller_id);
     // Request sequence ended so remove mapping.
     g_speech_input_callers.Get().RemoveId(caller_id);
@@ skipping 39 matching lines @@
     g_speech_input_callers.Get().render_view_id(caller_id);
   int caller_request_id = g_speech_input_callers.Get().request_id(caller_id);
   Send(new SpeechInputMsg_RecognitionComplete(caller_render_view_id,
                                               caller_request_id));
   // Request sequence ended, so remove mapping.
   g_speech_input_callers.Get().RemoveId(caller_id);
   VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition exit";
 }
 
 }  // namespace speech_input