diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:30:45 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:30:45 +0000 |
| commit | 897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 (patch) | |
| tree | fddba9cf19f4258a0b36a3fae5e27f2422cd277e /content/browser/speech/speech_recognizer_impl_unittest.cc | |
| parent | 103f19fbcf7d78efd8edc28bfabb3d4915a246de (diff) | |
| download | chromium_src-897bfb5aaaa57f0338a77fada1d5d3f9c3b38226.zip chromium_src-897bfb5aaaa57f0338a77fada1d5d3f9c3b38226.tar.gz chromium_src-897bfb5aaaa57f0338a77fada1d5d3f9c3b38226.tar.bz2 | |
Move media/audio files into media namespace
BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests
Review URL: https://chromiumcodereview.appspot.com/9805001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognizer_impl_unittest.cc')
| -rw-r--r-- | content/browser/speech/speech_recognizer_impl_unittest.cc | 10 |
1 files changed, 7 insertions, 3 deletions
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 { |