Revert "Revert of Support device scale factor test with popups in LayoutTest (patchset #2 id:40001 …

ui/views/widget/desktop_aura/desktop_screen_x11.cc

Index: ui/views/widget/desktop_aura/desktop_screen_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
index 07bcfca61899920bbca2f94f4301df74350af4b2..7afb1283a3f64b482aa245a1889a5f36a3ad349f 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
@@ -10,7 +10,9 @@
 // It clashes with out RootWindow.
 #undef RootWindow
 
+#include "base/command_line.h"
 #include "base/logging.h"
+#include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -252,13 +254,6 @@ uint32_t DesktopScreenX11::DispatchEvent(const ui::PlatformEvent& event) {
   return ui::POST_DISPATCH_NONE;
 }
 
-// static
-void DesktopScreenX11::UpdateDeviceScaleFactorForTest() {
-  DesktopScreenX11* screen =
-      static_cast<DesktopScreenX11*>(gfx::Screen::GetNativeScreen());
-  screen->ConfigureTimerFired();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, private: