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

chrome/browser_tests.isolate

Index: chrome/browser_tests.isolate
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 91a3a162b12061663981d67fb5f55d23b4db50f7..3b139fd98e0c32c3857b1a9dc823bff4dab2ed35 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -3,7 +3,20 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="linux"', {
+    ['use_x11==0', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',

[M-A Ruel, 2015/02/18 22:11:34]

So when use_x11==0 is set, chrome is started instead of browser_tests?

+          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
+        ],
+      },
+    }],
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -17,16 +30,16 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libclearkeycdm.so',
-          '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
-          '<(PRODUCT_DIR)/libppapi_tests.so',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="linux"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/libclearkeycdm.so',
+          '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
+          '<(PRODUCT_DIR)/libppapi_tests.so',
         ],
       },
     }],
@@ -168,19 +181,6 @@
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
-        ],
-      },
-    }],
     ['OS=="win"', {
       'variables': {
         'files': [