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

content/content_browsertests.isolate

 # Copyright (c) 2013 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"', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
         ],
@@ skipping 15 matching lines @@
     }],
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           '../media/test/data/',
           '../net/data/',
           'test/data/',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['use_x11==0', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
+        ],
+      },
+    }],
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
           '--lsan=<(lsan)',
           '--msan=<(msan)',
           '--tsan=<(tsan)',
         ],
         'files': [
           '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'files': [
           '<(PRODUCT_DIR)/content_shell.pak',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/libppapi_tests.so',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           '../net/tools/testserver/',
           '../ppapi/tests/test_case.html',
           '../ppapi/tests/test_page.css',
           '../testing/test_env.py',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
@@ skipping 19 matching lines @@
           '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/',
           '<(PRODUCT_DIR)/Content Shell.app.dSYM/',
           '<(PRODUCT_DIR)/content_browsertests.dSYM/',
           '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
           '<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/',
           '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/',
           '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/',
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
-        ],
-      },
-    }],
     ['OS=="win"', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/content_shell.pak',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
           '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
           '<(PRODUCT_DIR)/ppapi_tests.dll',
         ],
@@ skipping 12 matching lines @@
           '<(PRODUCT_DIR)/content_browsertests.exe.pdb',
         ],
       },
     }],
   ],
   'includes': [
     '../base/base.isolate',
     '../gin/v8.isolate',
   ],
 }