Remove target chromium_swarm_tests when test_isolate_mode == noop.

This is the default value. It can be overridden with GYP_DEFINES. It is with
the swarm master.
Also remove the corresponding XXX_run targets. These can be problematic when
developers are moving files around, especially with DEPS rolls.
This simplifies build slave management during the deployment as the .isolate
files are being rolled out.

TBR=cmp@chromium.org
NOTRY=true
BUG=139426

Review URL: https://chromiumcodereview.appspot.com/10828061

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148854 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -177,27 +177,6 @@
         ],
       ],
     }, # target_name: All_syzygy
-    {
-      'target_name': 'chromium_swarm_tests',
-      'type': 'none',
-      'dependencies': [
-        # Add new dependencies to the !ios section just below, not here (see
-        # the comment there).
-      ],
-      'conditions': [
-        ['OS!="ios"', {
-          'dependencies': [
-            # TODO(ios): This is temporary; currently almost nothing builds with
-            # OS=ios. Move dependencies back to the main dependencies section
-            # above as gyp files come online.
-            '../base/base.gyp:base_unittests_run',
-            '../chrome/chrome.gyp:browser_tests_run',
-            '../chrome/chrome.gyp:unit_tests_run',
-            '../net/net.gyp:net_unittests_run',
-          ],
-        }],
-      ],
-    }, # target_name: chromium_swarm_tests
     {
       'target_name': 'chromium_builder_tests',
       'type': 'none',
@@ -695,5 +674,19 @@
         },
       ],  # targets
     }], # "use_aura==1"
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'chromium_swarm_tests',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests_run',
+            '../chrome/chrome.gyp:browser_tests_run',
+            '../chrome/chrome.gyp:unit_tests_run',
+            '../net/net.gyp:net_unittests_run',
+          ],
+        }, # target_name: chromium_swarm_tests
+      ],
+    }],
   ], # conditions
 }