content/browser/media/capture/web_contents_video_capture_device_unittest.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase Created 4 years, 11 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 | « components/metrics/ui/screen_info_metrics_provider.cc ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9e3bf83c4616172b6190f9177327477fde34e83e..0d50e4d7761ca12cd76b7863b2cc7d40befe329c 100644

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

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

@@ -590,8 +590,8 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test {

test_screen_.display()->set_bounds(gfx::Rect(0, 0, 2560, 1440));

test_screen_.display()->set_device_scale_factor(kTestDeviceScaleFactor);

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen_);

- ASSERT_EQ(&test_screen_, gfx::Screen::GetNativeScreen());

+ gfx::Screen::SetScreenInstance(&test_screen_);

+ ASSERT_EQ(&test_screen_, gfx::Screen::GetScreen());

// TODO(nick): Sadness and woe! Much "mock-the-world" boilerplate could be

// eliminated here, if only we could use RenderViewHostTestHarness. The

@@ -649,7 +649,7 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test {

render_view_host_factory_.reset();

render_process_host_factory_.reset();

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);

+ gfx::Screen::SetScreenInstance(nullptr);

}

// Accessors.