Move media/audio files into media namespace (relanding)

content/browser/speech/speech_recognizer_impl.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_IMPL_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/speech/endpointer/endpointer.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/public/browser/speech_recognizer.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "media/audio/audio_input_controller.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace content {
 class SpeechRecognitionEventListener;
 struct SpeechRecognitionResult;
 }
 
 namespace media {
 class AudioInputController;
+class AudioManager;
 }
 
 namespace speech {
 
 // Records audio, sends recorded audio to server and translates server response
 // to recognition result.
 class CONTENT_EXPORT SpeechRecognizerImpl
     : public NON_EXPORTED_BASE(content::SpeechRecognizer),
       public media::AudioInputController::EventHandler,
       public NON_EXPORTED_BASE(SpeechRecognitionEngineDelegate) {
@@ skipping 49 matching lines @@
 
   // Handles OnData in the IO thread.
   void HandleOnData(scoped_refptr<AudioChunk> raw_audio);
 
   void OnAudioClosed(media::AudioInputController*);
 
   // Helper method which closes the audio controller and frees it asynchronously
   // without blocking the IO thread.
   void CloseAudioControllerAsynchronously();
 
-  void SetAudioManagerForTesting(AudioManager* audio_manager);
+  void SetAudioManagerForTesting(media::AudioManager* audio_manager);
 
   content::SpeechRecognitionEventListener* listener_;
-  AudioManager* testing_audio_manager_;
+  media::AudioManager* testing_audio_manager_;
   scoped_ptr<SpeechRecognitionEngine> recognition_engine_;
   Endpointer endpointer_;
   scoped_refptr<media::AudioInputController> audio_controller_;
   scoped_refptr<net::URLRequestContextGetter> context_getter_;
   int caller_id_;
   std::string language_;
   std::string grammar_;
   bool filter_profanities_;
   std::string hardware_info_;
   std::string origin_url_;
   int num_samples_recorded_;
   float audio_level_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl);
 };
 
 }  // namespace speech
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_