Convert remaining PostUploadHooks to use EnsureCQIncludeTrybotsAreAdded.

services/shape_detection/PRESUBMIT.py

Index: services/shape_detection/PRESUBMIT.py
diff --git a/services/shape_detection/PRESUBMIT.py b/services/shape_detection/PRESUBMIT.py
index ad094f7e94ef0b2051bfd5619b4d93f0cdac7d96..93854d4dc2554978f3ae0950b47547de8dc9083c 100644
--- a/services/shape_detection/PRESUBMIT.py
+++ b/services/shape_detection/PRESUBMIT.py
@@ -13,24 +13,12 @@ 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
+  This hook adds an extra try bot list to the CL description in order to run
   the Mac GPU bots in addition to the usual 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.mac:mac_optional_gpu_tests_rel' ]
-
-  results = []
-  new_description = description
-  new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
-  results.append(output_api.PresubmitNotifyResult(
-      'Automatically added optional Mac GPU tests 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.mac:mac_optional_gpu_tests_rel'
+    ],
+    'Automatically added optional Mac GPU tests to run on CQ.')