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

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 922 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 87 matching lines @@
                 },
               },
               # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
               'msvs_disabled_warnings': [ 4267, ],
             }],
             ['OS=="win" and win_use_allocator_shim==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
+            ['OS=="mac"', {
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:content_shell',  # Needed for Content Shell.app's Helper.
+              ],
+            }],
           ],
         },
       ],
     }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
           'target_name': 'components_unittests_run',
           'type': 'none',
           'dependencies': [
             'components_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',
           ],
           'sources': [
             'components_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }