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..1ff1ded6233f2f32e84c01190ab5ccd4999aa422 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,
@@ -55,6 +57,8 @@ class CONTENT_EXPORT SpeechRecognizer
   friend class base::RefCountedThreadSafe<SpeechRecognizer>;
   friend class SpeechRecognizerTest;
 
+  static media::AudioManager* audio_manager_for_tests_;

[tommi (sloooow) - chröme, 2012/07/11 11:12:30]

nit: keep this down where the other variables are.

[Primiano Tucci (use gerrit), 2012/07/11 14:33:30]

Done.

+
   enum FSMState {
     STATE_IDLE = 0,
     STATE_STARTING,
@@ -122,7 +126,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*);
@@ -142,7 +145,6 @@ class CONTENT_EXPORT SpeechRecognizer
       const content::SpeechRecognitionError& error) OVERRIDE;
 
   content::SpeechRecognitionEventListener* listener_;
-  media::AudioManager* testing_audio_manager_;
   scoped_ptr<SpeechRecognitionEngine> recognition_engine_;
   Endpointer endpointer_;
   scoped_refptr<media::AudioInputController> audio_controller_;