Make components_browsertests swarmable and add to main waterfall. (2nd try)

- Makes components_browsertests swarmable.
- Adds components_browsertests to the main waterfall for linux, mac and
  win bots.
- Updates the chromium tryserver to run components_browsertests as
  swarmable.
- Add content_shell as a dependency for components_browsertests for
  Mac, which is needed for the Content Shell helper on that platform.

The original CL did not add content_shell as a dependency for
components_browsertests, which made the build step for the isolate flaky
dependent upon whether content_shell happened to have already been built.

BUG=311270

Original CL:
Review: https://codereview.chromium.org/863023003/
Committed: https://crrev.com/7a3df3b7171fa87f556d22803fdc02a67e975865
Cr-Commit-Position: refs/heads/master@{#312886}

Revert CL:
https://codereview.chromium.org/856323003/
Committed: https://crrev.com/27ac8082963904942aaebcbf85620ae6e27ad5c9
Cr-Commit-Position: refs/heads/master@{#312976}

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

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

components/components_browsertests.isolate

+# 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.
+{
+  'includes': [
+    '../base/base.isolate',
+    '../gin/v8.isolate',
+  ],
+  'conditions': [
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'files': [
+          'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/components_resources.pak',
+          '<(PRODUCT_DIR)/content_shell.pak',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'command': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(PRODUCT_DIR)/components_browsertests',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
+        'files': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/libosmesa.so',
+        ],
+      },
+    }],
+    ['OS=="linux" and use_ozone==0', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
+    ['OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
+      },
+    }],
+    ['OS=="mac"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/Content Shell.app/',
+        ],
+      },
+    }],
+  ],
+}

components/components_tests.gyp

@@ -941,6 +941,30 @@
       ],
     }],
     ['OS!="ios"', {
+      'conditions': [
+        ['test_isolation_mode != "noop"', {
+          'targets': [
+            {
+              'target_name': 'components_browsertests_run',
+              'type': 'none',
+              'dependencies': [ 'components_browsertests' ],
+              'includes': [
+                '../build/isolate.gypi',
+              ],
+              'sources': [
+                'components_browsertests.isolate',
+              ],
+              'conditions': [
+                ['use_x11==1', {
+                  'dependencies': [
+                    '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+                  ],
+                }],
+              ],
+            },
+          ],
+        }],
+      ],
       'targets': [
         {
           'target_name': 'components_browsertests',
@@ -1048,6 +1072,11 @@
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
+            ['OS=="mac"', {
+              'dependencies': [
+		'../content/content_shell_and_tests.gyp:content_shell',  # Needed for Content Shell.app's Helper.
+              ],
+            }],
           ],
         },
       ],

testing/buildbot/chromium.linux.json

@@ -32,6 +32,12 @@
       "cast_unittests",
       "cc_unittests",
       "chromedriver_unittests",
+      {
+        "test": "components_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "components_unittests",
         "swarming": {

testing/buildbot/chromium.mac.json

@@ -30,6 +30,12 @@
       "cast_unittests",
       "cc_unittests",
       "chromedriver_unittests",
+      {
+        "test": "components_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "components_unittests",
         "swarming": {

testing/buildbot/chromium.win.json

@@ -22,6 +22,12 @@
       "cc_unittests",
       "chromedriver_unittests",
       "chrome_elf_unittests",
+      {
+        "test": "components_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "components_unittests",
         "swarming": {

testing/buildbot/chromium_memory_trybot.json

@@ -16,6 +16,12 @@
     },
     "cacheinvalidation_unittests",
     "cc_unittests",
+    {
+      "test": "components_browsertests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "components_unittests",
       "swarming": {

testing/buildbot/chromium_trybot.json

@@ -66,7 +66,12 @@
       "test": "chrome_elf_unittests",
       "platforms": ["win"]
     },
-    "components_browsertests",
+    {
+      "test": "components_browsertests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "components_unittests",
       "swarming": {