Small refactor to media architecture in order to allow end-to-end tests.

content/browser/speech/speech_recognizer.h

Index: content/browser/speech/speech_recognizer.h
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index 44db1eeb218b1800ca56ca294b826a8d4fe4e1cc..633f5b72f1a63e30004bcdec504abec4249592d5 100644
--- a/content/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -38,6 +38,8 @@ class CONTENT_EXPORT SpeechRecognizer
   static const int kNoSpeechTimeoutMs;
   static const int kEndpointerEstimationTimeMs;
 
+  static void SetAudioManagerForTests(media::AudioManager* audio_manager);
+
   SpeechRecognizer(
       content::SpeechRecognitionEventListener* listener,
       int session_id,
@@ -122,7 +124,6 @@ class CONTENT_EXPORT SpeechRecognizer
   void UpdateSignalAndNoiseLevels(const float& rms, bool clip_detected);
 
   void CloseAudioControllerAsynchronously();
-  void SetAudioManagerForTesting(media::AudioManager* audio_manager);
 
   // Callback called on IO thread by audio_controller->Close().
   void OnAudioClosed(media::AudioInputController*);
@@ -141,8 +142,9 @@ class CONTENT_EXPORT SpeechRecognizer
   virtual void OnSpeechRecognitionEngineError(
       const content::SpeechRecognitionError& error) OVERRIDE;
 
+  static media::AudioManager* audio_manager_for_tests_;
+
   content::SpeechRecognitionEventListener* listener_;
-  media::AudioManager* testing_audio_manager_;
   scoped_ptr<SpeechRecognitionEngine> recognition_engine_;
   Endpointer endpointer_;
   scoped_refptr<media::AudioInputController> audio_controller_;