rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/static/loader.js

 /*
  * Loader:
  * Reads GM result reports written out by results.py, and imports
  * them into $scope.extraColumnHeaders and $scope.imagePairs .
  */
 var Loader = angular.module(
     'Loader',
     ['ConstantsModule']
 );
 
@@ skipping 130 matching lines @@
           $scope.selectedImagePairs = [];
 
           // Sets within which the user can toggle individual elements.
           $scope.hiddenResultTypes = {};
           $scope.hiddenResultTypes[
               constants.KEY__RESULT_TYPE__FAILUREIGNORED] = true;
           $scope.hiddenResultTypes[
               constants.KEY__RESULT_TYPE__NOCOMPARISON] = true;
           $scope.hiddenResultTypes[
               constants.KEY__RESULT_TYPE__SUCCEEDED] = true;
-          $scope.allResultTypes = Object.keys(
+          $scope.allResultTypes =
               $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMN__RESULT_TYPE]
-                                       [constants.KEY__VALUES_AND_COUNTS]);
+                                       [constants.KEY__EXTRACOLUMNHEADERS__VALUES];
           $scope.hiddenConfigs = {};
-          $scope.allConfigs = Object.keys(
+          $scope.allConfigs =
               $scope.extraColumnHeaders[constants.KEY__EXTRACOLUMN__CONFIG]
-                                       [constants.KEY__VALUES_AND_COUNTS]);
+                                       [constants.KEY__EXTRACOLUMNHEADERS__VALUES];
 
           // Associative array of partial string matches per category.
           $scope.categoryValueMatch = {};
           $scope.categoryValueMatch.builder = "";
           $scope.categoryValueMatch.test = "";
 
           // If any defaults were overridden in the URL, get them now.
           $scope.queryParameters.load();
 
           // Any image URLs which are relative should be relative to the JSON
@@ skipping 635 matching lines @@
      */
     $scope.getImageDiffRelativeUrl = function(imagePair) {
       var before =
           imagePair[constants.KEY__IMAGE_A_URL] + "-vs-" +
           imagePair[constants.KEY__IMAGE_B_URL];
       return before.replace(/[^\w\-]/g, "_") + ".png";
     }
 
   }
 );