Remove from PRESUBMIT.py builders that will get removed from the tryserver

PRESUBMIT.py

 # Copyright (c) 2012 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.
 
 """Top-level presubmit script for Chromium.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 1479 matching lines @@
       'linux_gtk': standard_tests,
       'linux_chromeos_asan': ['compile'],
       'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
       'linux_chromium_chromeos_rel': ['defaulttests'],
       'linux_chromium_compile_dbg': ['defaulttests'],
       'linux_chromium_gn_rel': ['defaulttests'],
       'linux_chromium_rel': ['defaulttests'],
       'linux_chromium_clang_dbg': ['defaulttests'],
       'linux_gpu': ['defaulttests'],
       'linux_nacl_sdk_build': ['compile'],
-      'linux_rel': [
-          'telemetry_perf_unittests',
-          'telemetry_unittests',
-      ],
       'mac_chromium_compile_dbg': ['defaulttests'],
       'mac_chromium_rel': ['defaulttests'],
       'mac_gpu': ['defaulttests'],
       'mac_nacl_sdk_build': ['compile'],
-      'mac_rel': [
-          'telemetry_perf_unittests',
-          'telemetry_unittests',
-      ],
-      'win': ['compile'],
       'win_chromium_compile_dbg': ['defaulttests'],
       'win_chromium_dbg': ['defaulttests'],
       'win_chromium_rel': ['defaulttests'],
       'win_chromium_x64_rel': ['defaulttests'],
       'win_gpu': ['defaulttests'],
       'win_nacl_sdk_build': ['compile'],
-      'win_rel': standard_tests + [
-          'app_list_unittests',
-          'ash_unittests',
-          'aura_unittests',
-          'cc_unittests',
-          'chrome_elf_unittests',
-          'chromedriver_unittests',
-          'components_unittests',
-          'compositor_unittests',
-          'events_unittests',
-          'gfx_unittests',
-          'google_apis_unittests',
-          'installer_util_unittests',
-          'test_mini_installer',
-          'nacl_integration',
-          'remoting_unittests',
-          'sync_integration_tests',
-          'telemetry_perf_unittests',
-          'telemetry_unittests',
-          'views_unittests',
-      ],
-      'win_x64_rel': [
-          'base_unittests',
-      ],
   }
 
-  swarm_enabled_builders = (

[kjellander_chromium, 2014/06/09 12:12:31]

Is it right to remove this as well in this CL? It seems like the code does
nothing if this tuple is empty anyway.

[Paweł Hajdan Jr., 2014/06/09 12:26:39]

Yes, I think the new swarming-enabled bots would work in a different way, see
https://codereview.chromium.org/313693003/ .

-  # http://crbug.com/354263
-  #    'linux_rel',
-  #    'mac_rel',
-  #    'win_rel',
-  )
-
-  swarm_enabled_tests = (
-      'base_unittests',
-      'browser_tests',
-      'interactive_ui_tests',
-      'net_unittests',
-      'unit_tests',
-  )
-
-  for bot in builders_and_tests:
-    if bot in swarm_enabled_builders:
-      builders_and_tests[bot] = [x + '_swarm' if x in swarm_enabled_tests else x
-                                 for x in builders_and_tests[bot]]
-
   if bots:
     filtered_builders_and_tests = dict((bot, set(builders_and_tests[bot]))
                                        for bot in bots)
   else:
     filtered_builders_and_tests = dict(
         (bot, set(tests))
         for bot, tests in builders_and_tests.iteritems())
 
   # Build up the mapping from tryserver master to bot/test.
   out = dict()
@@ skipping 81 matching lines @@
     builders.extend(['cros_x86'])
 
   # The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
   # unless they're .gyp(i) files as changes to those files can break the gyp
   # step on that bot.
   if (not all(re.search('^chrome', f) for f in files) or
       any(re.search('\.gypi?$', f) for f in files)):
     builders.extend(['android_aosp'])
 
   return GetDefaultTryConfigs(builders)