Revert of Make components_browsertests swarmable and add to main waterfall.

components/components_tests.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 1020 matching lines @@
               'variables': {
                 'test_suite_name': 'components_unittests',
               },
               'includes': [ '../build/apk_test.gypi' ],
             },
           ],
         }],
       ],
     }],
     ['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',
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
             'components.gyp:autofill_content_browser',
             'components.gyp:autofill_content_renderer',
             'components.gyp:password_manager_content_renderer',
             'components.gyp:pref_registry_test_support',
@@ skipping 110 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'components_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }