BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 1 insertions, 15 deletions

diff --git a/chromium/content/browser/renderer_host/display_util.cc b/chromium/content/browser/renderer_host/display_util.cc
index 9ee2ff10ffe..b8b0c236cbb 100644
--- a/chromium/content/browser/renderer_host/display_util.cc
+++ b/chromium/content/browser/renderer_host/display_util.cc
@@ -53,21 +53,7 @@ void DisplayUtil::DisplayToScreenInfo(ScreenInfo* screen_info,
 
 // static
 void DisplayUtil::GetDefaultScreenInfo(ScreenInfo* screen_info) {
-  // Some tests are run with no Screen initialized.
-  display::Screen* screen = display::Screen::GetScreen();
-  if (!screen) {
-    *screen_info = ScreenInfo();
-    return;
-  }
-#if defined(USE_AURA)
-  // This behavior difference between Aura and other platforms may or may not
-  // be intentional, and may or may not have any effect.
-  gfx::NativeView null_native_view = nullptr;
-  display::Display display = screen->GetDisplayNearestView(null_native_view);
-#else
-  display::Display display = screen->GetPrimaryDisplay();
-#endif
-  DisplayToScreenInfo(screen_info, display);
+  return GetNativeViewScreenInfo(screen_info, nullptr);
 }
 
 // static