Revert "Use Xvfb in isolated testing only if use_x11 is set"

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 13a34fd5bcb259bf0c25466b6a7f980b0fedf682..68e1e01504424d757f7b5c9c3c0798275317c67a 100644
--- a/ui/touch_selection/ui_touch_selection_unittests.isolate
+++ b/ui/touch_selection/ui_touch_selection_unittests.isolate
@@ -11,19 +11,7 @@
         ],
       },
     }],
-    ['use_x11==0', {
-      'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
-      },
-    }],
-    ['use_x11==1', {
+    ['OS=="linux"', {
       'variables': {
         'command': [
           '../../testing/xvfb.py',
@@ -36,14 +24,14 @@
         ],
         'files': [
           '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="linux" and use_ozone==0', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
@@ -61,6 +49,18 @@
         ],
       },
     }],
+    ['OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
+      },
+    }],
   ],
   'includes': [
     '../../base/base.isolate',