make compare_rendered_pictures process render_pictures's new JSON output format

gm/rebaseline_server/compare_configs.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Compare GM results for two configs, across all builders.
 """
@@ skipping 70 matching lines @@
   def _load_config_pairs(self, configs):
     """Loads the results of all tests, across all builders (based on the
     files within self._actuals_root), compares them across two configs,
     and stores the summary in self._results.
 
     Args:
       configs: tuple of strings; pair of configs to compare
     """
     logging.info('Reading actual-results JSON files from %s...' %
                  self._actuals_root)
-    actual_builder_dicts = self._read_dicts_from_root(self._actuals_root)
+    actual_builder_dicts = self._read_builder_dicts_from_root(
+        self._actuals_root)
     configA, configB = configs
     logging.info('Comparing configs %s and %s...' % (configA, configB))
 
     all_image_pairs = imagepairset.ImagePairSet(
         descriptions=configs,
         diff_base_url=self._diff_base_url)
     failing_image_pairs = imagepairset.ImagePairSet(
         descriptions=configs,
         diff_base_url=self._diff_base_url)
 
@@ skipping 111 matching lines @@
   results_obj = ConfigComparisons(configs=args.config,
                                   actuals_root=args.actuals,
                                   generated_images_root=args.workdir)
   gm_json.WriteToFile(
       results_obj.get_packaged_results_of_type(results_type=args.results),
       args.outfile)
 
 
 if __name__ == '__main__':
   main()