Revert of Use xvfb with Ozone CrOS.

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index edbb434d27bfb36a9f3f4d1e8c0ab59231e909a3..59b820ad044823f0ea92bb03581bc3b2336493c8 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1060,14 +1060,14 @@
 
     android = 'target_os="android"' in vals['gn_args']
     ozone = 'use_ozone=true' in vals['gn_args']
-    chromeos = 'target_os="chromeos"' in vals['gn_args']
-
-    # 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
+    ozone_x11 = (ozone and 'args' in isolate_map[target] and
+                 '--ozone-platform=x11' in isolate_map[target]['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
                not android and
-               ((not ozone) or (ozone and chromeos)))
+               (ozone_x11 or not ozone))
 
     asan = 'is_asan=true' in vals['gn_args']
     msan = 'is_msan=true' in vals['gn_args']
@@ -1103,7 +1103,7 @@
       ]
       cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
                  + logdog_command + test_cmdline)
-    elif use_xvfb and test_type == 'windowed_test_launcher':
+    elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [
           '../../testing/test_env.py',
           '../../testing/xvfb.py',