Revert of Move ScreenWin to ui/display

testing/buildbot/chromium.win.json

Index: testing/buildbot/chromium.win.json
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 92a5fb2399a6337087307fb9902c89e05cada812..01ccc44ee94d97815e90447eb5cb1830c20903b1 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -133,12 +133,6 @@
           "can_use_on_swarming_builders": true
         },
         "test": "device_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "display_unittests"
       },
       {
         "swarming": {
@@ -550,12 +544,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "display_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "events_unittests"
       },
       {
@@ -983,12 +971,6 @@
           "can_use_on_swarming_builders": true
         },
         "test": "device_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "display_unittests"
       },
       {
         "swarming": {
@@ -1660,7 +1642,6 @@
       "courgette_unittests",
       "crypto_unittests",
       "device_unittests",
-      "display_unittests",
       "extensions_browsertests",
       "extensions_unittests",
       "gcm_unit_tests",