Revert of Move ScreenWin to ui/display

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index e733f03722a44449945a2f701ff027c5bc29543a..b5f413fc94afa96a6cc1a2884c1c85fa9940efe9 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -102,8 +102,8 @@
 #include "content/browser/renderer_host/legacy_render_widget_host_win.h"
 #include "content/common/plugin_constants_win.h"
 #include "ui/base/win/hidden_window.h"
-#include "ui/display/win/screen_win.h"
 #include "ui/gfx/gdi_util.h"
+#include "ui/gfx/screen_win.h"
 #include "ui/gfx/win/dpi.h"
 #endif
 
@@ -2419,8 +2419,8 @@
     if (hwnd_at_point == legacy_render_widget_host_HWND_->hwnd())
       hwnd_at_point = legacy_render_widget_host_HWND_->GetParent();
 
-    display::win::ScreenWin* screen_win =
-        static_cast<display::win::ScreenWin*>(screen);
+    gfx::ScreenWin* screen_win = static_cast<gfx::ScreenWin*>(screen);
+    DCHECK(screen_win);
     window_at_screen_point = screen_win->GetNativeWindowFromHWND(
         hwnd_at_point);
   }