Fix aggregators to use new gold objects

Change-Id: Iace9caec455a58cbe8649ea37d865f53e5643b17
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235457
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/lottiecap/gold/lottie-web-aggregator.go b/infra/lottiecap/gold/lottie-web-aggregator.go
index 161fa8c..d845e8e 100644
--- a/infra/lottiecap/gold/lottie-web-aggregator.go
+++ b/infra/lottiecap/gold/lottie-web-aggregator.go
@@ -164,14 +164,14 @@
 	}
 
 	results := jsonio.GoldResults{
-		BuildBucketID: *buildBucketID,
-		Builder:       *builder,
-		GitHash:       *gitHash,
-		Issue:         *issue,
-		Key:           defaultKeys,
-		Patchset:      *patchset,
-		Results:       results,
-		TaskID:        *taskId,
+		BuildBucketID:      *buildBucketID,
+		Builder:            *builder,
+		GitHash:            *gitHash,
+		GerritChangeListID: *issue,
+		Key:                defaultKeys,
+		GerritPatchSet:     *patchset,
+		Results:            results,
+		TaskID:             *taskId,
 	}
 
 	enc := json.NewEncoder(outputFile)
diff --git a/infra/wasm-common/gold/wasm_gold_aggregator.go b/infra/wasm-common/gold/wasm_gold_aggregator.go
index 85ef7e4..22c2853 100644
--- a/infra/wasm-common/gold/wasm_gold_aggregator.go
+++ b/infra/wasm-common/gold/wasm_gold_aggregator.go
@@ -176,14 +176,14 @@
 	}
 
 	dmresults := jsonio.GoldResults{
-		BuildBucketID: *buildBucketID,
-		Builder:       *builder,
-		GitHash:       *gitHash,
-		Issue:         *issue,
-		Key:           defaultKeys,
-		Patchset:      *patchset,
-		Results:       results,
-		TaskID:        *taskId,
+		BuildBucketID:      *buildBucketID,
+		Builder:            *builder,
+		GitHash:            *gitHash,
+		GerritChangeListID: *issue,
+		Key:                defaultKeys,
+		GerritPatchSet:     *patchset,
+		Results:            results,
+		TaskID:             *taskId,
 	}
 	enc := json.NewEncoder(outputFile)
 	enc.SetIndent("", "  ") // Make it human readable.