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

Unified Diff: content/browser/media/capture/web_contents_video_capture_device_unittest.cc

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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/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 e392bc9e653d257cc37f7e9a51e8875541c6fb56..a905d9ac1e33b9af25f08098b603d6472a89d199 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
@@ -603,10 +603,14 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test {
protected:
void SetUp() override {
- test_screen_.display()->set_id(0x1337);
- test_screen_.display()->set_bounds(gfx::Rect(0, 0, 2560, 1440));
- test_screen_.display()->set_device_scale_factor(kTestDeviceScaleFactor);
-
+ const display::Display test_display = test_screen_.GetPrimaryDisplay();
+ display::Display display(test_display);
+ display.set_id(0x1337);
+ display.set_bounds(gfx::Rect(0, 0, 2560, 1440));
+ display.set_device_scale_factor(kTestDeviceScaleFactor);
+ test_screen_.display_list().RemoveDisplay(test_display.id());
+ test_screen_.display_list().AddDisplay(display,
+ display::DisplayList::Type::PRIMARY);
display::Screen::SetScreenInstance(&test_screen_);
ASSERT_EQ(&test_screen_, display::Screen::GetScreen());
« no previous file with comments | « content/browser/media/capture/desktop_capture_device_unittest.cc ('k') | content/browser/media/url_provision_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698