Rewrite presubmit scripts to use new EnsureCQIncludeTrybotsAreAdded.

chrome_elf/PRESUBMIT.py

Index: chrome_elf/PRESUBMIT.py
diff --git a/chrome_elf/PRESUBMIT.py b/chrome_elf/PRESUBMIT.py
index 6827104dbd905916f6e41ee94204bb00caf061d5..952b6eac603dab581fe1eafde25b78cd5efa7a8e 100644
--- a/chrome_elf/PRESUBMIT.py
+++ b/chrome_elf/PRESUBMIT.py
@@ -8,31 +8,15 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
-import re
-
 def PostUploadHook(cl, change, output_api):
   """git cl upload will call this hook after the issue is created/modified.
 
   This hook adds extra try bots list to the CL description in order to run
   tests on the Windows 10 try bot in addition to CQ try bots.
   """
-  rietveld_obj = cl.RpcServer()
-  issue = cl.issue
-  description = rietveld_obj.get_description(issue)
-  if re.search(r'^CQ_INCLUDE_TRYBOTS=.*', description, re.M | re.I):
-    return []
-
-  bots = [
-    'master.tryserver.chromium.win:win10_chromium_x64_rel_ng',
-  ]
-
-  results = []
-  new_description = description
-  new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
-  results.append(output_api.PresubmitNotifyResult(
-      'Automatically added Win10 bot to run on CQ.'))
-
-  if new_description != description:
-    rietveld_obj.update_description(issue, new_description)
-
-  return results
+  return output_api.EnsureCQIncludeTrybotsAreAdded(
+    cl,
+    [
+      'master.tryserver.chromium.win:win10_chromium_x64_rel_ng',
+    ],
+    'Automatically added Win10 bot to run on CQ.')