content/browser/renderer_host/media/video_capture_host_unittest.cc - Issue 235353002: Extract VideoCaptureDeviceFactory out of VideoCaptureDevice and use for File and FakeVCD.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 235353002: Extract VideoCaptureDeviceFactory out of VideoCaptureDevice and use for File and FakeVCD. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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

« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_manager.h » ('j') | content/browser/renderer_host/media/video_capture_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_host_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc

index cd236399327edc86dc77ebb7d6581d3a2358aacc..d3981d69a11fc61d85a5f0b0e1991c8ccfffa797 100644

--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc

@@ -26,6 +26,7 @@

#include "content/test/test_content_browser_client.h"

#include "media/audio/audio_manager.h"

#include "media/base/video_frame.h"

+#include "media/video/capture/fake_video_capture_device_factory.h"

#include "media/video/capture/video_capture_types.h"

#include "net/url_request/url_request_context.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -285,7 +286,10 @@ class VideoCaptureHostTest : public testing::Test {

audio_manager_.reset(media::AudioManager::CreateForTesting());

media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));

#ifndef TEST_REAL_CAPTURE_DEVICE

- media_stream_manager_->UseFakeDevice();

+ media_stream_manager_->UseFakeVideoDevice(

+ scoped_ptr<media::VideoCaptureDeviceFactory>(

+ new media::FakeVideoCaptureDeviceFactory()));

+ media_stream_manager_->UseFakeAudioDevice();

#endif

media_stream_manager_->UseFakeUI(scoped_ptr<FakeMediaStreamUIProxy>());