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

ui/base/ui_base_unittests.isolate

Index: ui/base/ui_base_unittests.isolate
diff --git a/ui/base/ui_base_unittests.isolate b/ui/base/ui_base_unittests.isolate
index cc220b6bd16dc4011fab0d026c1f777900d05d32..16f6dd5fae04848172cbd51af4633d673df4fd15 100644
--- a/ui/base/ui_base_unittests.isolate
+++ b/ui/base/ui_base_unittests.isolate
@@ -21,19 +21,7 @@
         ],
       },
     }],
-    ['use_x11==0', {
-      'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/ui_base_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',
@@ -46,14 +34,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)',
         ],
       },
     }],
@@ -72,6 +60,18 @@
         ],
       },
     }],
+    ['OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
+      },
+    }],
   ],
   'includes': [
     '../../base/base.isolate',