From 67dfea903d4daa1287e372f36f70539f39b0350e Mon Sep 17 00:00:00 2001 From: "vrk@google.com" Date: Tue, 3 Apr 2012 01:49:09 +0000 Subject: Move media/audio files into media namespace (relanding) BUG=115187 TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests TBR=scherkus,jam Review URL: https://chromiumcodereview.appspot.com/9968054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130288 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/speech/speech_recognizer_impl_unittest.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'content/browser/speech/speech_recognizer_impl_unittest.cc') diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc index d553064..01b7e4c 100644 --- a/content/browser/speech/speech_recognizer_impl_unittest.cc +++ b/content/browser/speech/speech_recognizer_impl_unittest.cc @@ -20,12 +20,16 @@ using content::BrowserThread; using content::BrowserThreadImpl; using media::AudioInputController; +using media::AudioInputStream; +using media::AudioManager; +using media::AudioOutputStream; +using media::AudioParameters; using media::TestAudioInputController; using media::TestAudioInputControllerFactory; namespace { -class MockAudioManager : public AudioManagerBase { +class MockAudioManager : public media::AudioManagerBase { public: MockAudioManager() { audio_thread_.reset(new base::Thread("MockAudioThread")); @@ -40,7 +44,7 @@ class MockAudioManager : public AudioManagerBase { media::AudioDeviceNames* device_names) OVERRIDE {} virtual AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params) OVERRIDE { - return FakeAudioOutputStream::MakeFakeStream(this, params); + return media::FakeAudioOutputStream::MakeFakeStream(this, params); } virtual AudioOutputStream* MakeAudioOutputStreamProxy( const AudioParameters& params) OVERRIDE { @@ -49,7 +53,7 @@ class MockAudioManager : public AudioManagerBase { } virtual AudioInputStream* MakeAudioInputStream( const AudioParameters& params, const std::string& device_id) OVERRIDE { - return FakeAudioInputStream::MakeFakeStream(this, params); + return media::FakeAudioInputStream::MakeFakeStream(this, params); } virtual AudioOutputStream* MakeLinearOutputStream( const AudioParameters& params) OVERRIDE { -- cgit v1.1