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

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/renderer_host/media/media_stream_dispatcher_host_unittest.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc (revision 130181)
+++ content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc (working copy)
@@ -37,7 +37,7 @@
public:
MockMediaStreamDispatcherHost(content::ResourceContext* resource_context,
MessageLoop* message_loop,
- media::AudioManager* audio_manager)
+ AudioManager* audio_manager)
: MediaStreamDispatcherHost(resource_context, kProcessId, audio_manager),
message_loop_(message_loop) {}
virtual ~MockMediaStreamDispatcherHost() {}
@@ -153,7 +153,7 @@
io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
message_loop_.get()));
- audio_manager_.reset(media::AudioManager::Create());
+ audio_manager_.reset(AudioManager::Create());
// Make sure we use fake devices to avoid long delays.
MediaStreamManager::GetForResourceContext(
@@ -201,7 +201,7 @@
scoped_ptr<MessageLoop> message_loop_;
scoped_ptr<BrowserThreadImpl> ui_thread_;
scoped_ptr<BrowserThreadImpl> io_thread_;
- scoped_ptr<media::AudioManager> audio_manager_;
+ scoped_ptr<AudioManager> audio_manager_;
content::MockResourceContext resource_context_;
};

Powered by Google App Engine
This is Rietveld 408576698