Use Xvfb in isolated testing only if use_x11 is set (reland)

ui/message_center/message_center_unittests.isolate

Index: ui/message_center/message_center_unittests.isolate
diff --git a/ui/message_center/message_center_unittests.isolate b/ui/message_center/message_center_unittests.isolate
index b544bee1e3f719a7cc07b988405030ec2355da1f..ef9618e06994f9dfc5b7da27102f23b67139ad09 100644
--- a/ui/message_center/message_center_unittests.isolate
+++ b/ui/message_center/message_center_unittests.isolate
@@ -3,16 +3,20 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['use_x11==0', {
       'variables': {
-        'files': [
+        'command': [
           '../../testing/test_env.py',
           '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/ui_test.pak',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../../testing/xvfb.py',
@@ -26,41 +30,37 @@
         ],
         'files': [
           '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/ui_test.pak',
         ],
       },
     }],
-    ['OS=="mac"', {
+    ['OS=="linux"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/osmesa.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
       },
     }],
-    ['OS=="win"', {
+    ['OS=="mac"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/osmesa.dll',
+          '<(PRODUCT_DIR)/osmesa.so',
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
+    ['OS=="win"', {
       'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
+        'files': [
+          '<(PRODUCT_DIR)/osmesa.dll',
         ],
       },
     }],