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

content/browser/speech/speech_recognizer.cc

Index: content/browser/speech/speech_recognizer.cc
diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index 36a2565e0f575043ca500331179f2cc4c0767837..36f0fddd1aa89b6b3e0518dcafd823ef1cd5e30d 100644
--- a/content/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -73,6 +73,7 @@ const ChannelLayout SpeechRecognizer::kChannelLayout = CHANNEL_LAYOUT_MONO;
 const int SpeechRecognizer::kNumBitsPerAudioSample = 16;
 const int SpeechRecognizer::kNoSpeechTimeoutMs = 8000;
 const int SpeechRecognizer::kEndpointerEstimationTimeMs = 300;
+media::AudioManager* SpeechRecognizer::audio_manager_for_tests_ = NULL;
 
 COMPILE_ASSERT(SpeechRecognizer::kNumBitsPerAudioSample % 8 == 0,
                kNumBitsPerAudioSample_must_be_a_multiple_of_8);
@@ -83,7 +84,6 @@ SpeechRecognizer::SpeechRecognizer(
     bool is_single_shot,
     SpeechRecognitionEngine* engine)
     : listener_(listener),
-      testing_audio_manager_(NULL),
       recognition_engine_(engine),
       endpointer_(kAudioSampleRate),
       session_id_(session_id),
@@ -242,7 +242,6 @@ void SpeechRecognizer::DispatchEvent(const FSMEventArgs& event_args) {
   // The audio pipeline must be processed before the event dispatch, otherwise
   // it would take actions according to the future state instead of the current.
   state_ = ExecuteTransitionAndGetNextState(event_args);
-
   is_dispatching_event_ = false;
 }
 
@@ -393,8 +392,8 @@ SpeechRecognizer::FSMState
 SpeechRecognizer::StartRecording(const FSMEventArgs&) {
   DCHECK(recognition_engine_.get() != NULL);
   DCHECK(!IsCapturingAudio());
-  AudioManager* audio_manager = (testing_audio_manager_ != NULL) ?
-                                 testing_audio_manager_ :
+  AudioManager* audio_manager = (audio_manager_for_tests_ != NULL) ?
+                                 audio_manager_for_tests_ :
                                  BrowserMainLoop::GetAudioManager();
   DCHECK(audio_manager != NULL);
 
@@ -486,9 +485,10 @@ SpeechRecognizer::FSMState
 SpeechRecognizer::StopCaptureAndWaitForResult(const FSMEventArgs&) {
   DCHECK(state_ >= STATE_ESTIMATING_ENVIRONMENT && state_ <= STATE_RECOGNIZING);
 
+  recognition_engine_->AudioChunksEnded();
+
   DVLOG(1) << "Concluding recognition";
   CloseAudioControllerAsynchronously();
-  recognition_engine_->AudioChunksEnded();
 
   if (state_ > STATE_WAITING_FOR_SPEECH)
     listener_->OnSoundEnd(session_id_);
@@ -649,9 +649,9 @@ void SpeechRecognizer::UpdateSignalAndNoiseLevels(const float& rms,
       session_id_, clip_detected ? 1.0f : audio_level_, noise_level);
 }
 
-void SpeechRecognizer::SetAudioManagerForTesting(
+void SpeechRecognizer::SetAudioManagerForTests(
     AudioManager* audio_manager) {
-  testing_audio_manager_ = audio_manager;
+  audio_manager_for_tests_ = audio_manager;
 }
 
 SpeechRecognizer::FSMEventArgs::FSMEventArgs(FSMEvent event_value)