Revert of Support device scale factor test with popups in LayoutTest

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 62d4d5f62e4764a05547116f60c5fc1ea61a0681..1ad719c295af558cd3af6aefc205bc4a71581c4d 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
@@ -10,9 +10,7 @@
 // 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"
@@ -254,6 +252,13 @@ 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: