content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc - Issue 24133002: Make VideoCaptureController single-threaded and not ref counted.

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/web_contents_video_capture_device_unittest.cc

Issue 24133002: Make VideoCaptureController single-threaded and not ref counted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git pull Created 7 years, 3 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

« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/web_contents_video_capture_device.cc ('k') | media/media.gyp » ('j') | media/video/capture/video_capture_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8fbaca2c4505f42ae564554614ef4a21da99ace9..3420b09eb7b3b18548c55360c1645eafd9720eb2 100644

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

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

@@ -493,7 +493,7 @@ class WebContentsVideoCaptureDeviceTest : public testing::Test {

// Accessors.

CaptureTestSourceController* source() { return &controller_; }

- media::VideoCaptureDevice* device() { return device_.get(); }

+ media::VideoCaptureDevice1* device() { return device_.get(); }

StubConsumer* consumer() { return &consumer_; }

void SimulateDrawEvent() {

@@ -532,7 +532,7 @@ class WebContentsVideoCaptureDeviceTest : public testing::Test {

scoped_ptr<WebContents> web_contents_;

// Finally, the WebContentsVideoCaptureDevice under test.

- scoped_ptr<media::VideoCaptureDevice> device_;

+ scoped_ptr<media::VideoCaptureDevice1> device_;

TestBrowserThreadBundle thread_bundle_;

};

@@ -753,7 +753,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, RejectsInvalidAllocateParams) {

media::ConstantResolutionVideoCaptureDevice);

BrowserThread::PostTask(BrowserThread::UI,

FROM_HERE,

- base::Bind(&media::VideoCaptureDevice::Allocate,

+ base::Bind(&media::VideoCaptureDevice1::Allocate,

base::Unretained(device()),

capture_format,

consumer()));