Use xvfb with Ozone CrOS.

tools/mb/mb.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """MB - the Meta-Build wrapper around GYP and GN
 
 MB is a wrapper script for GYP and GN that can be used to generate build files
 for sets of canned configurations and analyze them.
 """
@@ skipping 1042 matching lines @@
       self.PrintJSON(outp)
       self.Print()
 
     return ret
 
   def GetIsolateCommand(self, target, vals):
     isolate_map = self.ReadIsolateMap()
 
     android = 'target_os="android"' in vals['gn_args']
     ozone = 'use_ozone=true' in vals['gn_args']
-    ozone_x11 = (ozone and 'args' in isolate_map[target] and
-                 '--ozone-platform=x11' in isolate_map[target]['args'])
+    chromeos = 'target_os="chromeos"' in vals['gn_args']
 
-    # This needs to mirror the settings in //build/config/ui.gni:
-    # use_x11 = is_linux && !use_ozone || use_ozone && --ozone-platform=x11
-    use_x11 = (self.platform == 'linux2' and
+    # This should be true if tests with type='windowed_test_launcher' are
+    # expected to run using xvfb. For example, Linux Desktop, X11 CrOS and
+    # Ozone CrOS builds.
+    use_xvfb = (self.platform == 'linux2' and
                not android and
-               (ozone_x11 or not ozone))
+               ((not ozone) or (ozone and chromeos)))
 
     asan = 'is_asan=true' in vals['gn_args']
     msan = 'is_msan=true' in vals['gn_args']
     tsan = 'is_tsan=true' in vals['gn_args']
 
     test_type = isolate_map[target]['type']
 
     executable = isolate_map[target].get('executable', target)
     executable_suffix = '.exe' if self.platform == 'win32' else ''
 
@@ skipping 15 matching lines @@
           '--name', 'unified_logcats',
       ]
       test_cmdline = [
           self.PathJoin('bin', 'run_%s' % target),
           '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
           '--target-devices-file', '${SWARMING_BOT_FILE}',
           '-v'
       ]
       cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
                  + logdog_command + test_cmdline)
-    elif use_x11 and test_type == 'windowed_test_launcher':
+    elif use_xvfb and test_type == 'windowed_test_launcher':
       extra_files = [
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
       ]
       cmdline = [
         '../../testing/xvfb.py',
         './' + str(executable) + executable_suffix,
         '--brave-new-test-launcher',
         '--test-launcher-bot-mode',
         '--asan=%d' % asan,
@@ skipping 452 matching lines @@
   # Then check to see if the arg contains any metacharacters other than
   # double quotes; if it does, quote everything (including the double
   # quotes) for safety.
   if any(a in UNSAFE_FOR_CMD for a in arg):
     arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
   return arg
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))