Revert of ScreenWin Testability and Restructuring

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 196 matching lines @@
     "transform_util.cc",
     "transform_util.h",
     "ui_gfx_exports.cc",
     "utf16_indexing.cc",
     "utf16_indexing.h",
     "vsync_provider.h",
     "win/direct_manipulation.cc",
     "win/direct_manipulation.h",
     "win/direct_write.cc",
     "win/direct_write.h",
-    "win/display_info.cc",
-    "win/display_info.h",
     "win/dpi.cc",
     "win/dpi.h",
     "win/hwnd_util.cc",
     "win/hwnd_util.h",
     "win/physical_size.cc",
     "win/physical_size.h",
     "win/scoped_set_map_mode.h",
-    "win/screen_win_display.cc",
-    "win/screen_win_display.h",
     "win/singleton_hwnd.cc",
     "win/singleton_hwnd.h",
     "win/singleton_hwnd_observer.cc",
     "win/singleton_hwnd_observer.h",
     "win/window_impl.cc",
     "win/window_impl.h",
   ]
   if (!is_ios) {
     sources += [
       "blit.cc",
@@ skipping 352 matching lines @@
 
 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
 
 source_set("test_support") {
   testonly = true
   sources = [
     "image/image_unittest_util.cc",
     "image/image_unittest_util.h",
     "image/image_unittest_util_ios.mm",
     "image/image_unittest_util_mac.mm",
-    "test/display_util.h",
     "test/fontconfig_util_linux.cc",
     "test/fontconfig_util_linux.h",
     "test/gfx_util.cc",
     "test/gfx_util.h",
     "test/test_screen.cc",
     "test/test_screen.h",
     "test/ui_cocoa_test_helper.h",
     "test/ui_cocoa_test_helper.mm",
   ]
 
@@ skipping 182 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }