Revert "Use Xvfb in isolated testing only if use_x11 is set"

This reverts commit 8a7be0714892c0c6360c45d0d602c119873b468e.

We've been seeing a problem with tab_capture_end2end_tests
taking too much time on linux_gpu_triggered_tests (over 1 hour
as opposed to below 30 seconds).

This was traced to wrong command on the isolate server,
as can be seen e.g. with [1] (good) and [2] (bad).

From builder history I was able to narrow down suspect revision range to just
cafcab99f5ea (good) [3] and 8a7be0714892 (bad) [4].

There are only two CLs in that range, https://codereview.chromium.org/841693004
and https://codereview.chromium.org/813363003 . First one is just a histogram
description change, while the latter changes *.isolate files, which is much more
suspect.

[1] https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=13030c2ece3e5467ba858a978c685865181d32a6
[2] https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=104dec9bff0fc701eac105a80d7d64be5b43b033
[3] http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu_triggered_tests/builds/97223
[4] http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu_triggered_tests/builds/97224

TBR=spang
BUG=440882

Review URL: https://codereview.chromium.org/843713002

Cr-Commit-Position: refs/heads/master@{#310464}

1 files changed, 18 insertions, 18 deletions

diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index b008bb42..bef0495 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -3,18 +3,7 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['use_x11==0', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
-      },
-    }],
-    ['use_x11==1', {
+    ['OS=="linux"', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -26,17 +15,17 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/libppapi_tests.so',
+          '<(PRODUCT_DIR)/pyproto/google/',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="linux" and use_ozone==0', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/libppapi_tests.so',
-          '<(PRODUCT_DIR)/pyproto/google/',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
@@ -79,6 +68,17 @@
         ],
       },
     }],
+    ['OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
+      },
+    }],
     ['OS=="win"', {
       'variables': {
         'files': [