Removing AudioSystem::GetAudioManager() usage from speech recognition

content/browser/speech/speech_recognizer_impl.h

 // Copyright (c) 2013 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_IMPL_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 25 matching lines @@
       public media::AudioInputController::EventHandler,
       public media::AudioInputController::SyncWriter,
       public NON_EXPORTED_BASE(SpeechRecognitionEngine::Delegate) {
  public:
   static const int kAudioSampleRate;
   static const media::ChannelLayout kChannelLayout;
   static const int kNumBitsPerAudioSample;
   static const int kNoSpeechTimeoutMs;
   static const int kEndpointerEstimationTimeMs;
 
-  static void SetAudioSystemForTesting(media::AudioSystem* audio_system);
+  static void SetAudioEnvironmentForTesting(media::AudioSystem* audio_system,
+                                            media::AudioManager* audio_manager);
 
   SpeechRecognizerImpl(SpeechRecognitionEventListener* listener,
                        media::AudioSystem* audio_system,
+                       media::AudioManager* audio_manager,
                        int session_id,
                        bool continuous,
                        bool provisional_results,
                        SpeechRecognitionEngine* engine);
 
   void StartRecognition(const std::string& device_id) override;
   void AbortRecognition() override;
   void StopAudioCapture() override;
   bool IsActive() const override;
   bool IsCapturingAudio() const override;
@@ skipping 95 matching lines @@
   void Close() override;
 
   // SpeechRecognitionEngineDelegate methods.
   void OnSpeechRecognitionEngineResults(
       const SpeechRecognitionResults& results) override;
   void OnSpeechRecognitionEngineEndOfUtterance() override;
   void OnSpeechRecognitionEngineError(
       const SpeechRecognitionError& error) override;
 
   media::AudioSystem* GetAudioSystem();
+  media::AudioManager* GetAudioManager();
 
   // Substitutes the real audio system in browser tests.
   static media::AudioSystem* audio_system_for_tests_;
+  static media::AudioManager* audio_manager_for_tests_;
   media::AudioSystem* audio_system_;
+  media::AudioManager* audio_manager_;
   std::unique_ptr<SpeechRecognitionEngine> recognition_engine_;
   Endpointer endpointer_;
   scoped_refptr<media::AudioInputController> audio_controller_;
   std::unique_ptr<media::AudioLog> audio_log_;
   int num_samples_recorded_;
   float audio_level_;
   bool is_dispatching_event_;
   bool provisional_results_;
   bool end_of_utterance_;
   FSMState state_;
   std::string device_id_;
   media::AudioParameters device_params_;
 
   class OnDataConverter;
 
   // Converts data between native input format and a WebSpeech specific
   // output format.
   std::unique_ptr<SpeechRecognizerImpl::OnDataConverter> audio_converter_;
 
   base::WeakPtrFactory<SpeechRecognizerImpl> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_