Domain Reliability: Reenable AddBakedInConfigs test

components/domain_reliability/bake_in_configs.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 
 """Takes the JSON files in components/domain_reliability/baked_in_configs and
 encodes their contents as an array of C strings that gets compiled in to Chrome
 and loaded at runtime."""
 
@@ skipping 515 matching lines @@
 
   json_files = read_json_files_from_gypi(gypi_file)
 
   cpp_code = CC_HEADER
   found_invalid_config = False
   for json_file in json_files:
     with open(json_file, 'r') as f:
       json_text = f.read()
     try:
       config = json.loads(json_text)
-    except ValueError:
-      print >> sys.stderr, "%s: error parsing JSON" % json_file
-      raise
+    except ValueError, e:
+      print >> sys.stderr, "%s: error parsing JSON: %s" % (json_file, e)
+      found_invalid_config = True
+      continue
     if 'monitored_domain' not in config:
       print >> sys.stderr, '%s: no monitored_domain found' % json_file
       found_invalid_config = True
       continue
     domain = config['monitored_domain']
     if not domain_is_whitelisted(domain):
       print >> sys.stderr, ('%s: monitored_domain "%s" not in whitelist' %
                             (json_file, domain))
       found_invalid_config = True
       continue
     cpp_code += "  // " + json_file + ":\n"
     cpp_code += quote_and_wrap_text(json_text) + ",\n"
     cpp_code += "\n"
   cpp_code += CC_FOOTER
 
   if found_invalid_config:
     return 1
 
   with open(cpp_file, 'wb') as f:
     f.write(cpp_code)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())