rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/testdata/outputs/expected/compare_to_expectations_test.CompareToExpectationsTest.test_gm/gm.json

Index: gm/rebaseline_server/testdata/outputs/expected/compare_to_expectations_test.CompareToExpectationsTest.test_gm/gm.json
diff --git a/gm/rebaseline_server/testdata/outputs/expected/compare_to_expectations_test.CompareToExpectationsTest.test_gm/gm.json b/gm/rebaseline_server/testdata/outputs/expected/compare_to_expectations_test.CompareToExpectationsTest.test_gm/gm.json
index f8774689fafadf09ffa64c93a4a3a7deb16b8ad5..07cc341b05a5b908baf7e7a137c55f92daa84923 100644
--- a/gm/rebaseline_server/testdata/outputs/expected/compare_to_expectations_test.CompareToExpectationsTest.test_gm/gm.json
+++ b/gm/rebaseline_server/testdata/outputs/expected/compare_to_expectations_test.CompareToExpectationsTest.test_gm/gm.json
@@ -1,58 +1,85 @@
 {
   "extraColumnHeaders": {
     "builder": {
+      "counts": [
+        13, 
+        15
+      ], 
       "headerText": "builder", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "Test-Android-GalaxyNexus-SGX540-Arm7-Release": 13, 
-        "Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug": 15
-      }
+      "values": [
+        "Test-Android-GalaxyNexus-SGX540-Arm7-Release", 
+        "Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug"
+      ]
     }, 
     "config": {
+      "counts": [
+        9, 
+        9, 
+        4, 
+        3, 
+        3
+      ], 
       "headerText": "config", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "565": 9, 
-        "8888": 9, 
-        "gpu": 4, 
-        "pdf-mac": 3, 
-        "pdf-poppler": 3
-      }
+      "values": [
+        "565", 
+        "8888", 
+        "gpu", 
+        "pdf-mac", 
+        "pdf-poppler"
+      ]
     }, 
     "resultType": {
+      "counts": [
+        1, 
+        4, 
+        9, 
+        14
+      ], 
       "headerText": "resultType", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "failed": 1, 
-        "failure-ignored": 4, 
-        "no-comparison": 9, 
-        "succeeded": 14
-      }
+      "values": [
+        "failed", 
+        "failure-ignored", 
+        "no-comparison", 
+        "succeeded"
+      ]
     }, 
     "test": {
+      "counts": [
+        7, 
+        2, 
+        7, 
+        2, 
+        5, 
+        2, 
+        2, 
+        1
+      ], 
       "headerText": "test", 
       "isFilterable": true, 
       "isSortable": true, 
-      "valuesAndCounts": {
-        "3x3bitmaprect": 7, 
-        "aaclip": 2, 
-        "bigblurs": 7, 
-        "bitmapsource": 2, 
-        "displacement": 5, 
-        "filterbitmap_checkerboard_192_192": 2, 
-        "filterbitmap_checkerboard_32_2": 2, 
-        "texdata": 1
-      }
+      "values": [
+        "3x3bitmaprect", 
+        "aaclip", 
+        "bigblurs", 
+        "bitmapsource", 
+        "displacement", 
+        "filterbitmap_checkerboard_192_192", 
+        "filterbitmap_checkerboard_32_2", 
+        "texdata"
+      ]
     }
   }, 
   "header": {
     "dataHash": "2775016045957284034", 
     "isEditable": false, 
     "isExported": true, 
-    "schemaVersion": 2, 
+    "schemaVersion": 3, 
     "timeNextUpdateAvailable": null, 
     "timeUpdated": 12345678, 
     "type": "all"