Refactoring display configuration state to allow generic state objects

ui/display/display.gyp

Index: ui/display/display.gyp
diff --git a/ui/display/display.gyp b/ui/display/display.gyp
index 4d32fcfda3b06f53c316d445c43340c4f4a394fa..941e3670c6745a7bb538f47c3988c6246f5c59a2 100644
--- a/ui/display/display.gyp
+++ b/ui/display/display.gyp
@@ -12,9 +12,68 @@
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+      ],
+      'defines': [
+        'DISPLAY_IMPLEMENTATION',
       ],
       'sources': [
+        'chromeos/display_mode.cc',
+        'chromeos/display_mode.h',
+        'chromeos/display_snapshot.cc',
+        'chromeos/display_snapshot.h',
+        'chromeos/native_display_delegate.h',
+        'chromeos/native_display_observer.h',
+        'chromeos/x11/display_mode_x11.cc',
+        'chromeos/x11/display_mode_x11.h',
+        'chromeos/x11/display_snapshot_x11.cc',
+        'chromeos/x11/display_snapshot_x11.h',
+        'chromeos/x11/native_display_delegate_x11.cc',
+        'chromeos/x11/native_display_delegate_x11.h',
+        'chromeos/x11/native_display_event_dispatcher_x11.cc',
+        'chromeos/x11/native_display_event_dispatcher_x11.h',
         'display_constants.h',
+        'display_export.h',
+        'display_util.cc',
+        'display_util.h',
+      ],
+      'conditions': [
+        ['use_x11 == 1', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:x11',
+            '<(DEPTH)/build/linux/system.gyp:xrandr',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'display_test_util',
+      'type': '<(component)',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+        'display',
+      ],
+      'defines': [
+        'DISPLAY_IMPLEMENTATION',
+      ],
+      'sources': [
+        'chromeos/test/test_display_snapshot.cc',
+        'chromeos/test/test_display_snapshot.h',
+      ],
+    },
+    {
+      'target_name': 'display_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:run_all_unittests',
+        '<(DEPTH)/base/base.gyp:test_support_base',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+        'display',
+      ],
+      'sources': [
+        'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc',
       ],
     },
   ],