Update isolate files for content tests and enable swarming for them.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284736 0039d316-1c4b-4281-b951-d872f2087c98

build/all.gyp

@@ -1264,6 +1264,8 @@
             # http://crbug.com/157234
             #'../chrome/chrome.gyp:sync_integration_tests_run',
             '../chrome/chrome.gyp:unit_tests_run',
+            '../content/content_shell_and_tests.gyp:content_browsertests_run',
+            '../content/content_shell_and_tests.gyp:content_unittests_run',
             '../net/net.gyp:net_unittests_run',
           ],
         }, # target_name: chromium_swarm_tests

content/content_browsertests.isolate

@@ -30,24 +30,24 @@
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/content_shell.pak',
-          '<(PRODUCT_DIR)/fonts.conf',
-          '<(PRODUCT_DIR)/libclearkeycdm.so',
-          '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/libppapi_tests.so',
           '<(PRODUCT_DIR)/plugins/libtest_netscape_plugin.so',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
+          '../ppapi/tests/test_case.html',
+          '../ppapi/tests/test_page.css',
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
           '../net/tools/testserver/',
-          '../third_party/WebKit/Tools/Scripts/',
-          '../third_party/lighttpd/',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
@@ -57,14 +57,13 @@
     ['OS=="mac"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
-          '<(PRODUCT_DIR)/content_resources.pak',
           '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin',
-          '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin',
+          '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/Content Shell.app/',
+          '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
+          '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
         ],
       },
     }],
@@ -80,15 +79,17 @@
     ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/ffmpegsumo.dll',
-          '<(PRODUCT_DIR)/chrome_100_percent.pak',
-          '<(PRODUCT_DIR)/clearkeycdm.dll',
-          '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
           '<(PRODUCT_DIR)/content_shell.pak',
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
+          '<(PRODUCT_DIR)/os_mesa.dll',
           '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
+          '<(PRODUCT_DIR)/ppapi_tests.dll',
         ],
       },
     }],
   ],
+  'includes': [
+    '../third_party/icu/icu.isolate',
+  ],
 }

content/content_tests.gypi

@@ -943,6 +943,20 @@
   'conditions': [
     ['test_isolation_mode != "noop"', {
       'targets': [
+        {
+          'target_name': 'content_browsertests_run',
+          'type': 'none',
+          'dependencies': [
+            'content_browsertests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'content_browsertests.isolate',
+          ],
+          'sources': [
+            'content_browsertests.isolate',
+          ],
+        },
         {
           'target_name': 'content_unittests_run',
           'type': 'none',

content/content_unittests.isolate

@@ -39,6 +39,7 @@
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
@@ -53,6 +54,7 @@
         ],
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
+          '<(PRODUCT_DIR)/osmesa.so',
         ],
       },
     }],
@@ -66,7 +68,7 @@
         ],
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
-          '<(PRODUCT_DIR)/ui_test.pak',
+          '<(PRODUCT_DIR)/osmesa.dll',
         ],
       },
     }],

testing/buildbot/chromium_trybot.json

@@ -40,8 +40,18 @@
       "test": "courgette_unittests",
       "platforms": ["win"]
     },
-    "content_browsertests",
-    "content_unittests",
+    {
+      "test": "content_browsertests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
+    {
+      "test": "content_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     "crypto_unittests",
     {
       "test": "dbus_unittests",