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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // 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"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/display/util/display_util.h"
 #include "ui/display/util/x11/edid_parser_x11.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 221 matching lines @@
           this,
           &DesktopScreenX11::ConfigureTimerFired);
     }
   } else {
     NOTREACHED();
   }
 
   return ui::POST_DISPATCH_NONE;
 }
 
-// static
-void DesktopScreenX11::UpdateDeviceScaleFactorForTest() {
-  DesktopScreenX11* screen =
-      static_cast<DesktopScreenX11*>(gfx::Screen::GetNativeScreen());
-  screen->ConfigureTimerFired();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, private:
 
 DesktopScreenX11::DesktopScreenX11(
     const std::vector<gfx::Display>& test_displays)
     : xdisplay_(gfx::GetXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       has_xrandr_(false),
       xrandr_event_base_(0),
       displays_(test_displays) {
@@ skipping 95 matching lines @@
   change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views