Swarm cc_unittests.

cc/cc_unittests.isolate

-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright 2015 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" or OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
-          '../media/test/data/',
           'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="android"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
-        ],
-      },
-    }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/content_shell.pak',
-        ],
-      },
-    }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
     ['OS=="linux"', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/cc_unittests',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
           '--lsan=<(lsan)',
         ],
         'files': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/xdisplaycheck',

[M-A Ruel, 2015/01/15 23:39:17]

Someone had been switching this condition on use_x11==1. I think it'd be better.
It's related to ozone and chromeos tests. Sorry I forgot to note that in the
previous CLs you did recently.

[jam, 2015/01/16 00:03:15]

ah, I had removed it since ozone isn't using swarming (they need special h/w).
so i thought no reason to complicate the isolate files until we need them to
support ozone, at which point updating all the files won't be hard?

[M-A Ruel, 2015/01/16 00:16:37]

Maybe it had broken compile? I don't mind really, it's easy to fix. Don't bother
too much with that, it was really just FYI.

         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
     ['OS=="mac"', {
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/cc_unittests',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
           '--lsan=<(lsan)',
         ],
         'files': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
           '<(PRODUCT_DIR)/osmesa.so',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/content_unittests.exe',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
           '--lsan=<(lsan)',
         ],
         'files': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
         ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/content_unittests.exe.pdb',
+          '<(PRODUCT_DIR)/cc_unittests.exe.pdb',
         ],
       },
     }],
   ],
   'includes': [
     '../base/base.isolate',
-    '../gin/v8.isolate',
   ],
 }