Reland: Run gl_unittests with Ozone X11.

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 364671fef7c3b2de54f2e7c9a72841b416cefa09..07ad4a2c77962ead483f3bdf953e58aa8d05ee75 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1056,19 +1056,23 @@ class MetaBuildWrapper(object):
     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'])
 
     # This needs to mirror the settings in //build/config/ui.gni:
-    # use_x11 = is_linux && !use_ozone.
+    # use_x11 = is_linux && !use_ozone || use_ozone && --ozone-platform=x11
     use_x11 = (self.platform == 'linux2' and
                not android and
-               not 'use_ozone=true' in vals['gn_args'])
+               (ozone_x11 or not ozone))
 
     asan = 'is_asan=true' in vals['gn_args']
     msan = 'is_msan=true' in vals['gn_args']
     tsan = 'is_tsan=true' in vals['gn_args']
 
-    isolate_map = self.ReadIsolateMap()
     test_type = isolate_map[target]['type']
 
     executable = isolate_map[target].get('executable', target)