Convert more isolate files to respect use_x11 for Xvfb usage

This is a followup to the update to disable Xvfb for OS=="linux"
use_x11==0 that converts additional targets.

BUG=440882
TEST=isolate.py run -s out_ozone/Debug/<various>
TBR=maruel

Review URL: https://codereview.chromium.org/996173004

Cr-Commit-Position: refs/heads/master@{#320143}

1 files changed, 28 insertions, 22 deletions

diff --git a/extensions/extensions_browsertests.isolate b/extensions/extensions_browsertests.isolate
index a8a6fb1..d939336 100644
--- a/extensions/extensions_browsertests.isolate
+++ b/extensions/extensions_browsertests.isolate
@@ -3,22 +3,20 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['use_x11==0', {
       'variables': {
-        'files': [
-          '../net/data/',
-          '../net/tools/testserver/',
+        'command': [
           '../testing/test_env.py',
-          '../third_party/pyftpdlib/',
-          '../third_party/pywebsocket/',
-          '../third_party/tlslite/',
           '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
-          'test/data/',
+          '--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 +30,35 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libosmesa.so',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '../net/data/',
+          '../net/tools/testserver/',
+          '../testing/test_env.py',
+          '../third_party/pyftpdlib/',
+          '../third_party/pywebsocket/',
+          '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
+          'test/data/',
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
+    ['OS=="linux"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
+        'files': [
+          '<(PRODUCT_DIR)/libosmesa.so',
+        ],
+      },
+    }],
+    ['OS=="linux" and use_ozone==0', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],