Convert remaining PostUploadHooks to use EnsureCQIncludeTrybotsAreAdded.

third_party/WebKit/PRESUBMIT.py

 # Copyright (c) 2013 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 Blink.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 344 matching lines @@
 def PostUploadHook(cl, change, output_api):  # pylint: disable=C0103
     """git cl upload will call this hook after the issue is created/modified.
 
     This hook adds extra try bots to the CL description in order to run slimming
     paint v2 tests in addition to the CQ try bots if the change contains paint
     or compositing changes (see: _ArePaintOrCompositingDirectoriesModified). For
     more information about slimming-paint-v2 tests see https://crbug.com/601275.
     """
     if not _ArePaintOrCompositingDirectoriesModified(change):
         return []
-
-    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_layout_tests_slimming_paint_v2',
-    ]
-
-    results = []
-    new_description = description
-    new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
-    results.append(output_api.PresubmitNotifyResult(
+    return output_api.EnsureCQIncludeTrybotsAreAdded(
+        cl,
+        ['master.tryserver.chromium.linux:'
+         'linux_layout_tests_slimming_paint_v2'],
         'Automatically added slimming-paint-v2 tests to run on CQ due to '
-        'changes in paint or compositing directories.'))
-
-    if new_description != description:
-        rietveld_obj.update_description(issue, new_description)
-
-    return results
+        'changes in paint or compositing directories.')