Revert of Gerrit git cl: temporary disable cc option on upload.

tests/git_cl_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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 803 matching lines @@
            ref_to_push),
           ]
     else:
       ref_to_push = 'HEAD'
 
     calls += [
         ((['git', 'rev-list',
             expected_upstream_ref + '..' + ref_to_push],), ''),
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
-    # Add cc from watch list.
-    # TODO(tandrii): bring this back after http://crbug.com/604377.
-    # if ref_suffix == '':
-    #   ref_suffix = '%cc=joe@example.com'
-    # else:
-    #   ref_suffix += ',cc=joe@example.com'
 
     notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
     if ref_suffix:
       ref_suffix += ',' + notify_suffix
     else:
       ref_suffix = '%' + notify_suffix
+
+    # Add cc from watch list.
+    ref_suffix += ',cc=joe@example.com'
+
     if reviewers:
       ref_suffix += ',' + ','.join('r=%s' % email
                                    for email in sorted(reviewers))
     calls += [
         ((['git', 'push', 'origin',
            ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
          ('remote:\n'
          'remote: Processing changes: (\)\n'
          'remote: Processing changes: (|)\n'
          'remote: Processing changes: (/)\n'
@@ skipping 676 matching lines @@
         ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
          ''),
     ]
     self.assertEqual(0, git_cl.main(['issue', '0']))
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()