Update isolate files for swarming tests

webrtc/modules/modules_unittests.isolate

Index: webrtc/modules/modules_unittests.isolate
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index bc6437f37ffb1b6c2e7156b7f7718f4c3b71f45a..5035f6ed0e79daaad6cf06318132ff301974e97b 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -129,7 +129,7 @@
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', {
       'variables': {
         'command': [
           '<(DEPTH)/testing/test_env.py',
@@ -142,5 +142,22 @@
         ],
       },
     }],
+    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==1', {

[kjellander_webrtc, 2015/10/21 16:30:11]

Kind of ugly but needed since isolate doesn't support multiple levels of
condition statements, it seems.

+      'variables': {
+        'command': [
+          '<(DEPTH)/testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(DEPTH)/testing/test_env.py',
+          '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+        'files': [
+          '<(DEPTH)/DEPS',
+          '<(DEPTH)/testing/test_env.py',
+          '<(DEPTH)/testing/xvfb.py',
+          '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
   ],
 }