Do not use the deprecated CQ_EXTRA_TRYBOTS

PRESUBMIT.py

 # Copyright (c) 2013 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 Skia.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
@@ skipping 419 matching lines @@
             output_api.PresubmitNotifyResult(
                 'Trybots do not yet work for non-master branches. '
                 'Automatically added \'NOTRY=true\' to the CL\'s description'))
       if not re.search(
           r'^NOPRESUBMIT=true$', new_description, re.M | re.I):
         new_description += "\nNOPRESUBMIT=true"
         results.append(
             output_api.PresubmitNotifyResult(
                 'Branch changes do not run the presubmit checks.'))
 
-    # Automatically set CQ_EXTRA_TRYBOTS if any of the changed files here begin
-    # with the paths of interest.
+    # Automatically set CQ_INCLUDE_TRYBOTS if any of the changed files here
+    # begin with the paths of interest.
     cq_master_to_trybots = collections.defaultdict(set)
     for affected_file in change.AffectedFiles():
       affected_file_path = affected_file.LocalPath()
       for path_prefix, extra_bots in PATH_PREFIX_TO_EXTRA_TRYBOTS.iteritems():
         if affected_file_path.startswith(path_prefix):
           results.append(
               output_api.PresubmitNotifyResult(
                   'Your CL modifies the path %s.\nAutomatically adding %s to '
                   'the CL description.' % (affected_file_path, extra_bots)))
           _MergeCQExtraTrybotsMaps(
               cq_master_to_trybots, _GetCQExtraTrybotsMap(extra_bots))
     if cq_master_to_trybots:
       new_description = _AddCQExtraTrybotsToDesc(
           cq_master_to_trybots, new_description)
 
     # If the description has changed update it.
     if new_description != original_description:
       rietveld_obj.update_description(issue, new_description)
 
     return results
 
 
 def _AddCQExtraTrybotsToDesc(cq_master_to_trybots, description):
-  """Adds the specified master and trybots to the CQ_EXTRA_TRYBOTS keyword.
+  """Adds the specified master and trybots to the CQ_INCLUDE_TRYBOTS keyword.
 
   If the keyword already exists in the description then it appends to it only
   if the specified values do not already exist.
   If the keyword does not exist then it creates a new section in the
   description.
   """
-  match = re.search(r'^CQ_EXTRA_TRYBOTS=(.*)$', description, re.M | re.I)
+  match = re.search(r'^CQ_INCLUDE_TRYBOTS=(.*)$', description, re.M | re.I)
   if match:
     original_trybots_map = _GetCQExtraTrybotsMap(match.group(1))
     _MergeCQExtraTrybotsMaps(cq_master_to_trybots, original_trybots_map)
     new_description = description.replace(
         match.group(0), _GetCQExtraTrybotsStr(cq_master_to_trybots))
   else:
     new_description = description + "\n%s" % (
         _GetCQExtraTrybotsStr(cq_master_to_trybots))
   return new_description
 
 
 def _MergeCQExtraTrybotsMaps(dest_map, map_to_be_consumed):
   """Merges two maps of masters to trybots into one."""
   for master, trybots in map_to_be_consumed.iteritems():
     dest_map[master].update(trybots)
   return dest_map
 
 
 def _GetCQExtraTrybotsMap(cq_extra_trybots_str):
-  """Parses the CQ_EXTRA_TRYBOTS str and returns a map of masters to trybots."""
+  """Parses CQ_INCLUDE_TRYBOTS str and returns a map of masters to trybots."""
   cq_master_to_trybots = collections.defaultdict(set)
   for section in cq_extra_trybots_str.split(';'):
     if section:
       master, bots = section.split(':')
       cq_master_to_trybots[master].update(bots.split(','))
   return cq_master_to_trybots
 
 
 def _GetCQExtraTrybotsStr(cq_master_to_trybots):
-  """Constructs the CQ_EXTRA_TRYBOTS str from a map of masters to trybots."""
+  """Constructs the CQ_INCLUDE_TRYBOTS str from a map of masters to trybots."""
   sections = []
   for master, trybots in cq_master_to_trybots.iteritems():
     sections.append('%s:%s' % (master, ','.join(trybots)))
-  return 'CQ_EXTRA_TRYBOTS=%s' % ';'.join(sections)
+  return 'CQ_INCLUDE_TRYBOTS=%s' % ';'.join(sections)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   """Presubmit checks for the change on commit.
 
   The following are the presubmit checks:
   * Check change has one and only one EOL.
   * Ensures that the Skia tree is open in
     http://skia-tree-status.appspot.com/. Shows a warning if it is in 'Caution'
     state and an error if it is in 'Closed' state.
   """
   results = []
   results.extend(_CommonChecks(input_api, output_api))
   results.extend(
       _CheckTreeStatus(input_api, output_api, json_url=(
           SKIA_TREE_STATUS_URL + '/banner-status?format=json')))
   results.extend(_CheckLGTMsForPublicAPI(input_api, output_api))
   results.extend(_CheckOwnerIsInAuthorsFile(input_api, output_api))
   return results