Use Xvfb in isolated testing only if use_x11 is set

base/base_unittests.isolate

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           'test/data/',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="linux" and use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
           '--lsan=<(lsan)',
         ],
         'files': [
           '../testing/xvfb.py',
-        ],
-      },
-    }],
-    ['OS=="linux" and use_ozone==0', {
-      'variables': {
-        'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'read_only': 1,
       },
     }],
-    ['OS=="mac" or OS=="win"', {
+    ['OS=="mac" or OS=="win" or use_ozone==1', {
       'variables': {
         'command': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
           '--lsan=<(lsan)',
         ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/base_unittests.exe.pdb',
         ],
       },
     }],
   ],
   'includes': [
     'base.isolate',
   ],
 }