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

Unified Diff: content/browser/renderer_host/media/video_capture_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/video_capture_host_unittest.cc
===================================================================
--- content/browser/renderer_host/media/video_capture_host_unittest.cc (revision 130181)
+++ content/browser/renderer_host/media/video_capture_host_unittest.cc (working copy)
@@ -72,7 +72,7 @@
class MockVideoCaptureHost : public VideoCaptureHost {
public:
MockVideoCaptureHost(content::ResourceContext* resource_context,
- media::AudioManager* audio_manager)
+ AudioManager* audio_manager)
: VideoCaptureHost(resource_context, audio_manager),
return_buffers_(false),
dump_video_(false) {}
@@ -205,7 +205,7 @@
io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
message_loop_.get()));
- audio_manager_.reset(media::AudioManager::Create());
+ audio_manager_.reset(AudioManager::Create());
#ifndef TEST_REAL_CAPTURE_DEVICE
media_stream::MediaStreamManager::GetForResourceContext(
@@ -246,7 +246,7 @@
// Called on the main thread.
static void PostQuitOnVideoCaptureManagerThread(
MessageLoop* message_loop, content::ResourceContext* resource_context,
- media:: AudioManager* audio_manager) {
+ AudioManager* audio_manager) {
media_stream::MediaStreamManager* manager =
media_stream::MediaStreamManager::GetForResourceContext(
resource_context, audio_manager);
@@ -362,7 +362,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_;
DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest);
« no previous file with comments | « content/browser/renderer_host/media/video_capture_host.cc ('k') | content/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698