Refactoring display configuration state to allow generic state objects

chromeos/chromeos.gyp

Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 2dda381432caa25236b04cf80e25f0e85d146397..bf06ad72d4824dd4d6d7bf9e48b9c6ed5c1d0231 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -27,6 +27,7 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/libxml/libxml.gyp:libxml',
         '../ui/display/display.gyp:display',
+        '../ui/gfx/gfx.gyp:gfx_geometry',
         '../url/url.gyp:url_lib',
         'ime/input_method.gyp:gencode',
         'power_manager_proto',
@@ -206,16 +207,8 @@
         'dbus/volume_state.h',
         'disks/disk_mount_manager.cc',
         'disks/disk_mount_manager.h',
-        'display/native_display_delegate.h',
-        'display/native_display_delegate_x11.cc',
-        'display/native_display_delegate_x11.h',
-        'display/native_display_event_dispatcher_x11.cc',
-        'display/native_display_event_dispatcher_x11.h',
-        'display/native_display_observer.h',
         'display/output_configurator.cc',
         'display/output_configurator.h',
-        'display/output_util.cc',
-        'display/output_util.h',
         'display/touchscreen_delegate_x11.cc',
         'display/touchscreen_delegate_x11.h',
         'ime/component_extension_ime_manager.cc',
@@ -352,7 +345,6 @@
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xi',
-            '../build/linux/system.gyp:xrandr',
           ],
         }, {
           # use_x11 == 0
@@ -361,10 +353,6 @@
             'ime/xkeyboard.h',
             'display/output_configurator.cc',
             'display/output_configurator.h',
-            'display/output_util.cc',
-            'display/output_util.h',
-            'display/real_output_configurator_delegate.cc',
-            'display/real_output_configurator_delegate.h',
             'ime/xkeyboard.cc',
             'ime/xkeyboard.h',
           ],
@@ -461,6 +449,9 @@
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../ui/display/display.gyp:display',
+        '../ui/display/display.gyp:display_test_util',
+        '../ui/gfx/gfx.gyp:gfx_geometry',
         '../url/url.gyp:url_lib',
         'chromeos_test_support',
         'power_manager_proto',
@@ -486,9 +477,7 @@
         'dbus/shill_profile_client_unittest.cc',
         'dbus/shill_service_client_unittest.cc',
         'disks/disk_mount_manager_unittest.cc',
-        'display/native_display_event_dispatcher_x11_unittest.cc',
         'display/output_configurator_unittest.cc',
-        'display/output_util_unittest.cc',
         'ime/component_extension_ime_manager_unittest.cc',
         'ime/extension_ime_util_unittest.cc',
         'ime/composition_text_unittest.cc',