Convert remaining PostUploadHooks to use EnsureCQIncludeTrybotsAreAdded.

chrome/browser/resources/PRESUBMIT.py

 # Copyright 2014 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.
 
 """Presubmit script for files in chrome/browser/resources.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
@@ skipping 96 matching lines @@
 
 def CheckChangeOnUpload(input_api, output_api):
   return _CheckChangeOnUploadOrCommit(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return _CheckChangeOnUploadOrCommit(input_api, output_api)
 
 
 def PostUploadHook(cl, change, output_api):
-  rietveld_obj = cl.RpcServer()
-  description = rietveld_obj.get_description(cl.issue)
-
-  existing_bots = (change.CQ_INCLUDE_TRYBOTS or '').split(';')
-  clean_bots = set(filter(None, map(lambda s: s.strip(), existing_bots)))
-  new_bots = clean_bots | set(
-      ['master.tryserver.chromium.linux:closure_compilation'])
-  new_tag = 'CQ_INCLUDE_TRYBOTS=%s' % ';'.join(new_bots)
-
-  if clean_bots:
-    tag_reg = '^CQ_INCLUDE_TRYBOTS=.*$'
-    new_description = re.sub(tag_reg, new_tag, description, flags=re.M | re.I)
-  else:
-    new_description = description + '\n' + new_tag
-
-  if new_description == description:
-    return []
-
-  rietveld_obj.update_description(cl.issue, new_description)
-  return [output_api.PresubmitNotifyResult(
-      'Automatically added optional Closure bots to run on CQ.')]
+  return output_api.EnsureCQIncludeTrybotsAreAdded(
+    cl,
+    [
+      'master.tryserver.chromium.linux:closure_compilation',
+    ],
+    'Automatically added optional Closure bots to run on CQ.')