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

content/browser/speech/speech_recognizer.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_RECOGNIZER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
     : public base::RefCountedThreadSafe<SpeechRecognizer>,
       public media::AudioInputController::EventHandler,
       public NON_EXPORTED_BASE(SpeechRecognitionEngineDelegate) {
  public:
   static const int kAudioSampleRate;
   static const ChannelLayout kChannelLayout;
   static const int kNumBitsPerAudioSample;
   static const int kNoSpeechTimeoutMs;
   static const int kEndpointerEstimationTimeMs;
 
+  static void SetAudioManagerForTests(media::AudioManager* audio_manager);
+
   SpeechRecognizer(
       content::SpeechRecognitionEventListener* listener,
       int session_id,
       bool is_single_shot,
       SpeechRecognitionEngine* engine);
 
   void StartRecognition();
   void AbortRecognition();
   void StopAudioCapture();
   bool IsActive() const;
   bool IsCapturingAudio() const;
   const SpeechRecognitionEngine& recognition_engine() const;
 
  private:
   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,
     STATE_ESTIMATING_ENVIRONMENT,
     STATE_WAITING_FOR_SPEECH,
     STATE_RECOGNIZING,
     STATE_WAITING_FINAL_RESULT,
     STATE_MAX_VALUE = STATE_WAITING_FINAL_RESULT
   };
 
@@ skipping 47 matching lines @@
   FSMState NotFeasible(const FSMEventArgs& event_args);
 
   // Returns the time span of captured audio samples since the start of capture.
   int GetElapsedTimeMs() const;
 
   // Calculates the input volume to be displayed in the UI, triggering the
   // OnAudioLevelsChange event accordingly.
   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*);
 
   // AudioInputController::EventHandler methods.
   virtual void OnCreated(media::AudioInputController* controller) OVERRIDE {}
   virtual void OnRecording(media::AudioInputController* controller) OVERRIDE {}
   virtual void OnError(media::AudioInputController* controller,
                        int error_code) OVERRIDE;
   virtual void OnData(media::AudioInputController* controller,
                       const uint8* data, uint32 size) OVERRIDE;
 
   // SpeechRecognitionEngineDelegate methods.
   virtual void OnSpeechRecognitionEngineResult(
       const content::SpeechRecognitionResult& result) OVERRIDE;
   virtual void OnSpeechRecognitionEngineError(
       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_;
   int session_id_;
   int num_samples_recorded_;
   float audio_level_;
   bool is_dispatching_event_;
   bool is_single_shot_;
   FSMState state_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizer);
 };
 
 }  // namespace speech
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_