Revert of Make components_browsertests swarmable and add to main waterfall....

Revert of Make components_browsertests swarmable and add to main waterfall. (patchset #3 id:40001 of https://codereview.chromium.org/863023003/)

Reason for revert:
Cause mac build flakiness, see http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/21875/steps/compile/logs/stdio

I think the '<(PRODUCT_DIR)/Content Shell.app/', line in the isolate needs to go. Looking closer, we should be launching the components_browsertest binary for the renderer as well. Right now it launches Content Shell for the renderer, which seems odd.

Original issue's description:
> Make components_browsertests swarmable and add to main waterfall.
>
> - 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.
>
> BUG=311270
>
> Committed: https://crrev.com/7a3df3b7171fa87f556d22803fdc02a67e975865
> Cr-Commit-Position: refs/heads/master@{#312886}

TBR=nyquist@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=311270

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

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

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

@@ -1040,30 +1040,6 @@
       ],
     }],
     ['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',

testing/buildbot/chromium.linux.json

@@ -32,12 +32,6 @@
       "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,12 +30,6 @@
       "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,12 +22,6 @@
       "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,12 +16,6 @@
     },
     "cacheinvalidation_unittests",
     "cc_unittests",
-    {
-      "test": "components_browsertests",
-      "swarming": {
-        "can_use_on_swarming_builders": true
-      }
-    },
     {
       "test": "components_unittests",
       "swarming": {

testing/buildbot/chromium_trybot.json

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