Revert of Reduce spam from CQ.

tests/project_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Integration tests for project.py."""
 
 import logging
 import os
 import random
@@ skipping 417 matching lines @@
             "[u'browser_tests']})" % issue,
         "trigger_try_jobs(%d, 1, 'CQ', False, 'HEAD', {u'mac_rel': "
             "[u'browser_tests']})" % issue,
         "trigger_try_jobs(%d, 1, 'CQ', False, 'HEAD', {u'win_rel': "
             "[u'browser_tests']})" % issue,
     ]
     self._verify_final_state(pending_manager.queue.get(issue).verifications,
                              why_not, rietveld_calls)
 
   def test_tbr(self):
-    self.time = map(lambda x: float(x*35), range(16))
+    self.time = map(lambda x: float(x*35), range(15))
     self.urlrequests = [
       ('https://chromium-status.appspot.com/allstatus?format=json&endTime=85',
         # Cheap hack here.
         '[]'),
     ]
     root_dir = os.path.join(os.getcwd(), 'root_dir')
     self.read_lines = [
         [
           os.path.join(root_dir, '.chromium_status_pwd'),
           'chromium-status password',
@@ skipping 30 matching lines @@
     pc.update_status()
     pc.scan_results()
     self.assertEqual(0, len(pc.queue.iterate()))
     # check_calls
     self.context.rietveld.check_calls([
       _try_comment(pc),
       "trigger_try_jobs(31337, 1, 'CQ', False, 'HEAD', "
           "{u'chromium_presubmit': ['presubmit']})",
       'close_issue(31337)',
       "update_description(31337, u'foo\\nTBR=')",
-      "set_flag(31337, 1, 'commit', False)",
       "add_comment(31337, 'Change committed as 125')",
       ])
     self.context.checkout.check_calls([
       'prepare(None)',
       'apply_patch(%r)' % self.context.rietveld.patchsets[0],
       'prepare(None)',
       'apply_patch(%r)' % self.context.rietveld.patchsets[1],
       "commit(u'foo\\nTBR=\\n\\nReview URL: http://nowhere/31337', "
           "u'user@example.com')",
       ])
     self.context.status.check_names(['initial', 'why not', 'why not',
-                                     'why not', 'commit', 'abort'])
+                                     'why not', 'commit'])
 
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.WARNING,
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
   unittest.main()