content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc - Issue 16267002: Re-fix http://crbug.com/87176, and add a test.

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 16267002: Re-fix http://crbug.com/87176, and add a test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Much shorter test Created 7 years, 6 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/child_process_launcher.cc ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | content/browser/renderer_host/render_process_host_impl.cc » ('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 58f291452241aaa7a89d0a698e2fee3695c9d971..52bca58f3dd0eff57ba25746ff9961171e9321d3 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

@@ -447,8 +447,8 @@ class WebContentsVideoCaptureDeviceTest : public testing::Test {

scoped_refptr<SiteInstance> site_instance =

SiteInstance::Create(browser_context_.get());

- static_cast<SiteInstanceImpl*>(site_instance.get())->

- set_render_process_host_factory(render_process_host_factory_.get());

+ SiteInstanceImpl::set_render_process_host_factory(

+ render_process_host_factory_.get());

web_contents_.reset(

TestWebContents::Create(browser_context_.get(), site_instance.get()));

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

content::RunAllPendingInMessageLoop();

+ SiteInstanceImpl::set_render_process_host_factory(NULL);

render_view_host_factory_.reset();

render_process_host_factory_.reset();

}