Convert more isolate files to respect use_x11 for Xvfb usage

components/components_browsertests.isolate

Index: components/components_browsertests.isolate
diff --git a/components/components_browsertests.isolate b/components/components_browsertests.isolate
index 6a6d4dc67da6bd7e3be8dbf56da0fdcbee4fd42e..c18c7cfe0941ee7875dd7c4115e0894470710fc4 100644
--- a/components/components_browsertests.isolate
+++ b/components/components_browsertests.isolate
@@ -7,18 +7,20 @@
     '../gin/v8.isolate',
   ],
   'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['use_x11==0', {
       'variables': {
-        'files': [
-          'test/data/',
+        'command': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/components_tests_resources.pak',
-          '<(PRODUCT_DIR)/content_shell.pak',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -32,27 +34,25 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/components_tests_resources.pak',
+          '<(PRODUCT_DIR)/content_shell.pak',
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
+    ['OS=="linux"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
+        'files': [
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
       },
     }],