Revert of ScreenWin Testability and Restructuring

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 290 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',
       ],
       'includes': [
         '../../build/android/increase_size_for_speed.gypi',
       ],
@@ skipping 190 matching lines @@
       'hard_dependency': 1,
     },
     {
       'target_name': 'gfx_test_support',
       'type': 'static_library',
       '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',
       ],
       'dependencies': [
@@ skipping 38 matching lines @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }