[CT] Update worker scripts to use new benchmarks and delete old benchmarks

ct/go/worker_scripts/capture_skps/main.go

 // Application that captures SKPs from CT's webpage archives.
 package main
 
 import (
         "encoding/csv"
         "flag"
         "fmt"
         "io/ioutil"
         "os"
         "path/filepath"
         "runtime"
         "sync"
         "time"
 
         "github.com/skia-dev/glog"
 
-        "strings"
-
         "go.skia.org/infra/ct/go/util"
         "go.skia.org/infra/ct/go/worker_scripts/worker_common"
         "go.skia.org/infra/go/common"
         skutil "go.skia.org/infra/go/util"
 )
 
 const (
         // The number of goroutines that will run in parallel to capture SKPs.
         WORKER_POOL_SIZE = 10
 )
@@ skipping 123 matching lines @@
 
                 // Create and run a goroutine closure that captures SKPs.
                 go func() {
                         // Decrement the WaitGroup counter when the goroutine completes.
                         defer wg.Done()
 
                         for pagesetName := range pagesetRequests {
 
                                 mutex.RLock()
 
-                                pagesetBaseName := filepath.Base(pagesetName)
-                                // Convert the filename into a format consumable by the run_benchmarks
-                                // binary.
-                                pagesetNameNoExt := strings.TrimSuffix(pagesetBaseName, filepath.Ext(pagesetBaseName))
+                                // Read the pageset.
                                 pagesetPath := filepath.Join(pathToPagesets, pagesetName)
+                                decodedPageset, err := util.ReadPageset(pagesetPath)
+                                if err != nil {
+                                        glog.Errorf("Could not read %s: %s", pagesetPath, err)
+                                        continue
+                                }
 
                                 glog.Infof("===== Processing %s =====", pagesetPath)
 
                                 skutil.LogErr(os.Chdir(pathToPyFiles))
                                 args := []string{
-                                        util.BINARY_RUN_BENCHMARK,
-                                        fmt.Sprintf("%s.%s", util.BENCHMARK_SKPICTURE_PRINTER, util.BenchmarksToPagesetName[util.BENCHMARK_SKPICTURE_PRINTER]),
-                                        "--page-set-name=" + pagesetNameNoExt,
-                                        "--page-set-base-dir=" + pathToPagesets,
+                                        filepath.Join(util.TelemetryBinariesDir, util.BINARY_RUN_BENCHMARK),
+                                        util.BenchmarksToPagesetName[util.BENCHMARK_SKPICTURE_PRINTER],
                                         "--also-run-disabled-tests",
                                         "--page-repeat=1", // Only need one run for SKPs.
                                         "--skp-outdir=" + pathToSkps,
                                         "--extra-browser-args=" + util.DEFAULT_BROWSER_ARGS,
+                                        "--user-agent=" + decodedPageset.UserAgent,
+                                        "--urls-list=" + decodedPageset.UrlsList,
+                                        "--archive-data-file=" + decodedPageset.ArchiveDataFile,
                                 }
                                 // Figure out which browser should be used.
                                 if *targetPlatform == util.PLATFORM_ANDROID {
                                         args = append(args, "--browser=android-chromium")
                                 } else {
                                         args = append(args, "--browser=exact", "--browser-executable="+chromiumBinary)
                                 }
                                 // Set the PYTHONPATH to the pagesets and the telemetry dirs.
                                 env := []string{
                                         fmt.Sprintf("PYTHONPATH=%s:%s:%s:$PYTHONPATH", pathToPagesets, util.TelemetryBinariesDir, util.TelemetrySrcDir),
@@ skipping 107 matching lines @@
         }
         writer := csv.NewWriter(csvFile)
         defer writer.Flush()
         for _, row := range [][]string{headers, values} {
                 if err := writer.Write(row); err != nil {
                         return fmt.Errorf("Could not write to %s: %s", csvPath, err)
                 }
         }
         return nil
 }