rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json

Index: gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
diff --git a/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json b/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
index 7a0c912c43514179360bfb34e8201e7dc2fe9a43..28faf5daec85bc23e125ac92f2c3aefa8234c5f2 100644
--- a/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
+++ b/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
@@ -1,47 +1,63 @@
 {
   "extraColumnHeaders": {
     "builder": {
+      "counts": [
+        3
+      ], 
       "headerText": "builder", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "TODO": 3
-      }
+      "values": [
+        "TODO"
+      ]
     }, 
     "config": {
+      "counts": [
+        3
+      ], 
       "headerText": "config", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "whole-image": 3
-      }
+      "values": [
+        "whole-image"
+      ]
     }, 
     "resultType": {
+      "counts": [
+        1, 
+        1, 
+        1
+      ], 
       "headerText": "resultType", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "failed": 1, 
-        "no-comparison": 1, 
-        "succeeded": 1
-      }
+      "values": [
+        "failed", 
+        "no-comparison", 
+        "succeeded"
+      ]
     }, 
     "test": {
+      "counts": [
+        1, 
+        1, 
+        1
+      ], 
       "headerText": "test", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "changed.skp": 1, 
-        "only-in-before.skp": 1, 
-        "unchanged.skp": 1
-      }
+      "values": [
+        "changed.skp", 
+        "only-in-before.skp", 
+        "unchanged.skp"
+      ]
     }
   }, 
   "header": {
     "dataHash": "182723807383859624", 
     "isEditable": false, 
     "isExported": true, 
-    "schemaVersion": 2, 
+    "schemaVersion": 3, 
     "timeNextUpdateAvailable": null, 
     "timeUpdated": 12345678, 
     "type": "all"