Use Xvfb in isolated testing only if use_x11 is set (reland)

ui/touch_selection/ui_touch_selection_unittests.isolate

Index: ui/touch_selection/ui_touch_selection_unittests.isolate
diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/touch_selection/ui_touch_selection_unittests.isolate
index 4e8079af87c3d40fcd05168d1956348732afa6fd..e32ab83ea810fbfc981eb6d3cd4b62e8956daec4 100644
--- a/ui/touch_selection/ui_touch_selection_unittests.isolate
+++ b/ui/touch_selection/ui_touch_selection_unittests.isolate
@@ -11,11 +11,10 @@
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['use_x11==0', {
       'variables': {
         'command': [
-          '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
+          '../../testing/test_env.py',
           '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
@@ -23,23 +22,13 @@
           '--msan=<(msan)',
           '--tsan=<(tsan)',
         ],
-        'files': [
-          '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libosmesa.so',
-        ],
-      },
-    }],
-    ['OS=="linux" and use_ozone==0', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-        ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
+    ['use_x11==1', {
       'variables': {
         'command': [
-          '../../testing/test_env.py',
+          '../../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
           '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
@@ -47,6 +36,17 @@
           '--msan=<(msan)',
           '--tsan=<(tsan)',
         ],
+        'files': [
+          '../../testing/xvfb.py',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/libosmesa.so',
+        ],
       },
     }],
     ['OS=="mac" and asan==1 and fastbuild==0', {