X11 and Ozone: Move some x11 tests down to platform_window level

These should be as close to platform level as possible. Thus, avoid
having them outside platform.

Bug: 789065
Change-Id: Ie61150ae6c9b56c167475c3798464b4f4290b950
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332610
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794875}

ui/events/BUILD.gn

@@ -621,14 +621,6 @@ if (!is_ios) {
       data_deps = [ "//third_party/mesa_headers" ]
     }
 
-    if (use_x11) {
-      sources += [ "devices/x11/device_data_manager_x11_unittest.cc" ]
-      deps += [
-        "//ui/events/devices/x11",
-        "//ui/events/x:unittests",
-      ]
-    }
-
     if (use_x11 || use_ozone) {
       sources += [ "devices/device_data_manager_unittest.cc" ]
     }

ui/events/x/BUILD.gn

@@ -29,28 +29,3 @@ component("x") {
     "//ui/gfx/x",
   ]
 }
-
-# XEvent translation tests are kept in a separate source_set so that both
-# ozone_x11_unittests and aura/x11 events_unittests can depend on it.
-# TODO(crbug.com/789065): Move this completely into ozone/x11 unit tests once
-# X11 migration to Ozone is complete.
-source_set("unittests") {
-  testonly = true
-  visibility = [
-    "//ui/events:events_unittests",
-    "//ui/ozone/platform/x11:x11_unittests",
-  ]
-  sources = [
-    "events_x_unittest.cc",
-    "x11_event_translation_unittest.cc",
-  ]
-  deps = [
-    "//base/test:test_support",
-    "//testing/gtest",
-    "//ui/base:features",
-    "//ui/events:test_support",
-    "//ui/events/devices/x11",
-    "//ui/events/x:x",
-    "//ui/gfx/x",
-  ]
-}

ui/ozone/platform/x11/BUILD.gn

@@ -102,7 +102,6 @@ source_set("x11_unittests") {
     "//ui/events:test_support",
     "//ui/events/devices/x11",
     "//ui/events/platform/x11",
-    "//ui/events/x:unittests",
     "//ui/ozone:platform",
     "//ui/ozone:test_support",
     "//ui/ozone/common",

ui/platform_window/x11/BUILD.gn

@@ -52,7 +52,12 @@ jumbo_component("x11") {
 }
 
 test("x11_unittests") {
-  sources = [ "test/x11_window_unittest.cc" ]
+  sources = [
+    "test/device_data_manager_x11_unittest.cc",
+    "test/events_x_unittest.cc",
+    "test/x11_event_translation_unittest.cc",
+    "test/x11_window_unittest.cc",
+  ]
   deps = [
     ":x11",
     "//base/test:run_all_unittests",
@@ -60,6 +65,7 @@ test("x11_unittests") {
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
+    "//ui/base:features",
     "//ui/base/x",
     "//ui/base/x:test_support",
     "//ui/events:test_support",