Change top-level PRESUBMIT to support split 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 1352 matching lines @@
       '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:
-    return [(bot, set(builders_and_tests[bot])) for bot in bots]
+    return {
+        'tryserver.chromium': dict((bot, set(builders_and_tests[bot]))
+                                   for bot in bots)
+    }
   else:
-    return [(bot, set(tests)) for bot, tests in builders_and_tests.iteritems()]
+    return {
+        'tryserver.chromium': dict(
+            (bot, set(tests))
+            for bot, tests in builders_and_tests.iteritems())
+    }
 
 
 def CheckChangeOnCommit(input_api, output_api):
   results = []
   results.extend(_CommonChecks(input_api, output_api))
   # TODO(thestig) temporarily disabled, doesn't work in third_party/
   #results.extend(input_api.canned_checks.CheckSvnModifiedDirectories(
   #    input_api, output_api, sources))
   # Make sure the tree is 'open'.
   results.extend(input_api.canned_checks.CheckTreeIsOpen(
       input_api,
       output_api,
       json_url='http://chromium-status.appspot.com/current?format=json'))
 
   results.extend(input_api.canned_checks.CheckChangeHasBugField(
       input_api, output_api))
   results.extend(input_api.canned_checks.CheckChangeHasDescription(
       input_api, output_api))
   results.extend(_CheckSubversionConfig(input_api, output_api))
   return results
 
 
-def GetPreferredTrySlaves(project, change):
+def GetPreferredTryMasters(project, change):
   files = change.LocalPaths()
 
   if not files or all(re.search(r'[\\/]OWNERS$', f) for f in files):
-    return []
+    return {}
 
   if all(re.search('\.(m|mm)$|(^|[/_])mac[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'mac_chromium_compile_dbg',
         'mac_chromium_rel',
         'mac_rel'
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
     return GetDefaultTryConfigs(['win', 'win_rel'])
   if all(re.search('(^|[/_])android[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'android_aosp',
         'android_clang_dbg',
         'android_dbg',
     ])
   if all(re.search('[/_]ios[/_.]', f) for f in files):
     return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
 
-  trybots = GetDefaultTryConfigs([
+  builders = [
       'android_clang_dbg',
       'android_dbg',
       'ios_dbg_simulator',
       'ios_rel_device',
       'linux_gtk',
       'linux_asan',
       'linux_chromium_chromeos_rel',
       'linux_chromium_clang_dbg',
       'linux_nacl_sdk_build',
       'linux_chromium_rel',
       'linux_rel',
       'mac_chromium_compile_dbg',
       'mac_nacl_sdk_build',
       'mac_chromium_rel',
       'mac_rel',
       'win',
       'win_nacl_sdk_build',
       'win_rel',
       'win_x64_rel',
-  ])
+  ]
 
   # Match things like path/aura/file.cc and path/file_aura.cc.
   # Same for chromeos.
   if any(re.search('[/_](aura|chromeos)', f) for f in files):
-    trybots.extend(GetDefaultTryConfigs([
-        'linux_chromeos_asan', 'linux_chromium_chromeos_clang_dbg']))
+    builders.extend([
+        'linux_chromeos_asan',
+        'linux_chromium_chromeos_clang_dbg'
+    ])
 
   # If there are gyp changes to base, build, or chromeos, run a full cros build
   # in addition to the shorter linux_chromeos build. Changes to high level gyp
   # files have a much higher chance of breaking the cros build, which is
   # differnt from the linux_chromeos build that most chrome developers test
   # with.
   if any(re.search('^(base|build|chromeos).*\.gypi?$', f) for f in files):
-    trybots.extend(GetDefaultTryConfigs(['cros_x86']))
+    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)):
-    trybots.extend(GetDefaultTryConfigs(['android_aosp']))
+    builders.extend(['android_aosp'])
 
-  return trybots
+  return GetDefaultTryConfigs(builders)