Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Unified Diff: content/browser/speech/speech_recognizer_impl_unittest.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: 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 6f7b4fdd6660c39e6f560f0faa8a6f102fb866a9..eda53332f84a0f6b135d8bac6d49df271fc64d10 100644
--- a/content/browser/speech/speech_recognizer_impl_unittest.cc
+++ b/content/browser/speech/speech_recognizer_impl_unittest.cc
@@ -19,12 +19,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"));
@@ -39,7 +43,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 {
@@ -48,7 +52,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 {

Powered by Google App Engine
This is Rietveld 408576698