Rewrite presubmit scripts to use new EnsureCQIncludeTrybotsAreAdded.

content/test/gpu/PRESUBMIT.py

 # Copyright 2015 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 content/test/gpu.
 
 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 _GetPathsToPrepend(input_api):
   current_dir = input_api.PresubmitLocalPath()
   chromium_src_dir = input_api.os_path.join(current_dir, '..', '..', '..')
   return [
     input_api.os_path.join(current_dir, 'gpu_tests'),
     input_api.os_path.join(chromium_src_dir, 'tools', 'perf'),
     input_api.os_path.join(chromium_src_dir,
         'third_party', 'catapult', 'telemetry'),
     input_api.os_path.join(chromium_src_dir,
         'third_party', 'catapult', 'common', 'py_utils'),
@@ skipping 33 matching lines @@
   return results
 
 def CheckChangeOnCommit(input_api, output_api):
   results = []
   results.extend(_GpuUnittestsArePassingCheck(input_api, output_api))
   return results
 
 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
-  Blink tests in addition to CQ try bots.
+  This hook modifies the CL description in order to run extra GPU
+  tests (in particular, the WebGL 2.0 conformance tests) in addition
+  to the regular CQ try bots. This test suite is too large to run
+  against all Chromium commits, but should be run against changes
+  likely to affect these tests.
   """
-  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.linux:linux_optional_gpu_tests_rel',
-    'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
-    'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
-    'master.tryserver.chromium.android:android_optional_gpu_tests_rel',
-  ]
-
-  results = []
-  new_description = description
-  new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
-  results.append(output_api.PresubmitNotifyResult(
-      'Automatically added optional 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.linux:linux_optional_gpu_tests_rel',
+      'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
+      'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
+      'master.tryserver.chromium.android:android_optional_gpu_tests_rel',
+    ],
+    'Automatically added optional GPU tests to run on CQ.')