X11 and Ozone: fix compilation of vulkan tests.

Otherwise, they don't compile for use_x11 && use_ozone case

Bug: 1085700
Change-Id: I56a2afd959a694cb6a80422f440f85419d35f1f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333200Reviewed-by: Peng Huang <penghuang@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#794569}

gpu/vulkan/BUILD.gn

@@ -171,26 +171,21 @@ if (enable_vulkan) {
       "//ui/gfx:native_widget_types",
     ]
 
-    if (use_x11 && !use_ozone) {
+    if (use_x11 || use_ozone) {
       sources += [ "tests/native_window.cc" ]
-      deps += [
-        "//ui/platform_window",
-        "//ui/platform_window/x11",
-      ]
+      deps += [ "//ui/platform_window" ]
+      if (use_x11) {
+        deps += [ "//ui/platform_window/x11" ]
+      }
+      if (use_ozone) {
+        deps += [ "//ui/ozone" ]
+      }
     }
 
     if (is_win) {
       sources += [ "tests/native_window_win.cc" ]
     }
 
-    if (use_ozone) {
-      sources += [ "tests/native_window.cc" ]
-      deps += [
-        "//ui/ozone",
-        "//ui/platform_window",
-      ]
-    }
-
     if (is_android) {
       sources += [ "tests/native_window_android.cc" ]
       deps += [