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

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 024040b3ebc43d7fce7e4c577d27cc1fe213f745..baa86690d32b5916fa16bf37c5b5d60e83bd44c9 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -940,6 +940,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',
@@ -1047,6 +1071,11 @@
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
+            ['OS=="mac"', {
+              'dependencies': [
+		'../content/content_shell_and_tests.gyp:content_shell',  # Needed for Content Shell.app's Helper.
+              ],
+            }],
           ],
         },
       ],