Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

content/browser/speech/speech_input_manager.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 31 matching lines @@
   // Describes the microphone errors that are reported via ShowMicError.
   enum MicError {
     kNoDeviceAvailable = 0,
     kDeviceInUse
   };
 
   SpeechInputManager();
 
   // Invokes the platform provided microphone settings UI in a non-blocking way,
   // via the BrowserThread::FILE thread.
-  static void ShowAudioInputSettings(AudioManager* audio_manager);
-
-  // Same as ShowAudioInputSettings above but can be called from the UI thread
-  // where the caller has a pointer to a resource context, but due to not
-  // running on the IO thread, cannot access its properties.
-  static void ShowAudioInputSettingsFromUI(
-      content::ResourceContext* resource_context);
+  static void ShowAudioInputSettings();
 
   virtual ~SpeechInputManager();
 
+  // These are wrappers around AudioManager.

[tommi (sloooow) - chröme, 2012/02/23 07:50:59]

much nicer!

+  bool HasAudioInputDevices();
+  bool IsRecordingInProcess();
+  string16 GetAudioInputDeviceModel();
+
   // Handlers for requests from render views.
 
   // |delegate| is a weak pointer and should remain valid until
   // its |DidCompleteRecognition| method is called or recognition is cancelled.
   // |render_process_id| is the ID of the renderer process initiating the
   // request.
   // |element_rect| is the display bounds of the html element requesting speech
   // input (in page coordinates).
   virtual void StartRecognition(
       content::SpeechInputManagerDelegate* 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,
-      content::SpeechInputPreferences* speech_input_prefs,
-      AudioManager* audio_manager);
+      content::SpeechInputPreferences* speech_input_prefs);
   virtual void CancelRecognition(int caller_id);
   virtual void CancelAllRequestsWithDelegate(
       content::SpeechInputManagerDelegate* delegate);
   virtual void StopRecording(int caller_id);
 
   // Overridden from content::SpeechRecognizerDelegate:
   virtual void DidStartReceivingAudio(int caller_id) OVERRIDE;
   virtual void SetRecognitionResult(
       int caller_id,
       const content::SpeechInputResult& result) OVERRIDE;
   virtual void DidCompleteRecording(int caller_id) OVERRIDE;
   virtual void DidCompleteRecognition(int caller_id) OVERRIDE;
   virtual void DidStartReceivingSpeech(int caller_id) OVERRIDE;
   virtual void DidStopReceivingSpeech(int caller_id) OVERRIDE;
 
   virtual void OnRecognizerError(int caller_id,
                                  content::SpeechInputError error) OVERRIDE;
   virtual void DidCompleteEnvironmentEstimation(int caller_id) OVERRIDE;
   virtual void SetInputVolume(int caller_id, float volume,
                               float noise_volume) OVERRIDE;
 
  protected:
   // The pure virtual methods are used for displaying the current state of
   // recognition and for fetching optional request information.
 
   // Get the optional request information if available.
-  virtual void GetRequestInfo(AudioManager* audio_manager,
-                              bool* can_report_metrics,
+  virtual void GetRequestInfo(bool* can_report_metrics,
                               std::string* request_info) = 0;
 
   // Called when recognition has been requested from point |element_rect_| on
   // the view port for the given caller.
   virtual void ShowRecognitionRequested(int caller_id,
                                         int render_process_id,
                                         int render_view_id,
                                         const gfx::Rect& element_rect) = 0;
 
   // Called when recognition is starting up.
@@ skipping 50 matching lines @@
   typedef std::map<int, SpeechInputRequest> SpeechRecognizerMap;
   SpeechRecognizerMap requests_;
   std::string request_info_;
   bool can_report_metrics_;
   int recording_caller_id_;
 };
 
 }  // namespace speech_input
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_