Rewrite presubmit scripts to use new EnsureCQIncludeTrybotsAreAdded.

third_party/WebKit/Source/modules/webgl/PRESUBMIT.py

Index: third_party/WebKit/Source/modules/webgl/PRESUBMIT.py
diff --git a/third_party/WebKit/Source/modules/webgl/PRESUBMIT.py b/third_party/WebKit/Source/modules/webgl/PRESUBMIT.py
index ea3c90f0dbdcb336cca5ca87f1d4140f7696f0cc..3bfa1ce640ef118b0e431e3985b0716d0a93d0bc 100644
--- a/third_party/WebKit/Source/modules/webgl/PRESUBMIT.py
+++ b/third_party/WebKit/Source/modules/webgl/PRESUBMIT.py
@@ -2,41 +2,24 @@
 # 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 gpu.
+"""Top-level presubmit script for Source/modules/webgl.
 
 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
-    extra GPU 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',
-    ]
-
-    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'],
+        'Automatically added optional GPU tests to run on CQ.')