Resolve TODOs in PRESUBMIT.py

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 Skia.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
@@ skipping 226 matching lines @@
       authors_content = ''
       for line in open(AUTHORS_FILE_NAME):
         if not line.startswith('#'):
           authors_content += line
       email_fnmatches = re.findall('<(.*)>', authors_content)
       for email_fnmatch in email_fnmatches:
         if fnmatch.fnmatch(owner_email, email_fnmatch):
           # Found a match, the user is in the AUTHORS file break out of the loop
           break
       else:
-        # TODO(rmistry): Remove the below CLA messaging once a CLA checker has
-        # been added to the CQ.

[rmistry, 2015/10/01 15:01:38]

The CQ now fails if CLA has not been signed.

         results.append(
           output_api.PresubmitError(
             'The email %s is not in Skia\'s AUTHORS file.\n'
             'Issue owner, this CL must include an addition to the Skia AUTHORS '
-            'file.\n'
-            'Googler reviewers, please check that the AUTHORS entry '
-            'corresponds to an email address in http://goto/cla-signers. If it '
-            'does not then ask the issue owner to sign the CLA at '
-            'https://developers.google.com/open-source/cla/individual '
-            '(individual) or '
-            'https://developers.google.com/open-source/cla/corporate '
-            '(corporate).'
+            'file.'
             % owner_email))
     except IOError:
       # Do not fail if authors file cannot be found.
       traceback.print_exc()
       input_api.logging.error('AUTHORS file not found!')
 
   return results
 
 
 def _CheckLGTMsForPublicAPI(input_api, output_api):
@@ skipping 19 matching lines @@
 
   lgtm_from_owner = False
   issue = input_api.change.issue
   if issue and input_api.rietveld:
     issue_properties = input_api.rietveld.get_issue_properties(
         issue=int(issue), messages=True)
     if re.match(REVERT_CL_SUBJECT_PREFIX, issue_properties['subject'], re.I):
       # It is a revert CL, ignore the public api owners check.
       return results
 
-    # TODO(rmistry): Stop checking for COMMIT=false once crbug/470609 is
-    # resolved.

[rmistry, 2015/10/01 15:01:38]

I resolved this bug.

-    if issue_properties['cq_dry_run'] or re.search(
-        r'^COMMIT=false$', issue_properties['description'], re.M):
+    if issue_properties['cq_dry_run']:
       # Ignore public api owners check for dry run CLs since they are not
       # going to be committed.
       return results
 
     match = re.search(r'^TBR=(.*)$', issue_properties['description'], re.M)
     if match:
       tbr_entries = match.group(1).strip().split(',')
       for owner in PUBLIC_API_OWNERS:
         if owner in tbr_entries or owner.split('@')[0] in tbr_entries:
           # If an owner is specified in the TBR= line then ignore the public
@@ skipping 177 matching lines @@
     state and an error if it is in 'Closed' state.
   """
   results = []
   results.extend(_CommonChecks(input_api, output_api))
   results.extend(
       _CheckTreeStatus(input_api, output_api, json_url=(
           SKIA_TREE_STATUS_URL + '/banner-status?format=json')))
   results.extend(_CheckLGTMsForPublicAPI(input_api, output_api))
   results.extend(_CheckOwnerIsInAuthorsFile(input_api, output_api))
   return results