Dedupe codereview.settings parsing code. Add more testing.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 190 matching lines @@
   return FILES_CACHE[filename]
 
 
 def GetCodeReviewSetting(key):
   """Returns a value for the given key for this repository."""
   # Use '__just_initialized' as a flag to determine if the settings were
   # already initialized.
   if '__just_initialized' not in CODEREVIEW_SETTINGS:
     settings_file = GetCachedFile(CODEREVIEW_SETTINGS_FILE)
     if settings_file:
-      for line in settings_file.splitlines():
-        if not line or line.startswith('#'):
-          continue
-        if not ':' in line:
-          raise gclient_utils.Error(
-              '%s is invalid, please fix. It\'s content:\n\n%s' %
-                  (CODEREVIEW_SETTINGS_FILE, settings_file))
-        k, v = line.split(':', 1)
-        CODEREVIEW_SETTINGS[k.strip()] = v.strip()
+      CODEREVIEW_SETTINGS.update(
+          gclient_utils.ParseCodereviewSettingsContent(settings_file))
     CODEREVIEW_SETTINGS.setdefault('__just_initialized', None)
   return CODEREVIEW_SETTINGS.get(key, "")
 
 
 def Warn(msg):
   print >> sys.stderr, msg
 
 
 def ErrorExit(msg):
   print >> sys.stderr, msg
@@ skipping 1234 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))