Migrate cluster telemetry benchmarks to tools/perf/contrib/cluster_telemetry/

tools/perf/contrib/cluster_telemetry/skpicture_printer.py

Index: tools/perf/contrib/cluster_telemetry/skpicture_printer.py
diff --git a/tools/perf/benchmarks/skpicture_printer.py b/tools/perf/contrib/cluster_telemetry/skpicture_printer.py
similarity index 87%
rename from tools/perf/benchmarks/skpicture_printer.py
rename to tools/perf/contrib/cluster_telemetry/skpicture_printer.py
index 09a844dd47448d142b4aa07643eb62ccd5bddbe4..450f62a0d0ed0a6a7a4c7e385a88de2007b0d050 100644
--- a/tools/perf/benchmarks/skpicture_printer.py
+++ b/tools/perf/contrib/cluster_telemetry/skpicture_printer.py
@@ -4,9 +4,10 @@
 
 from core import perf_benchmark
 
-import ct_benchmarks_util
-import page_sets
-from page_sets import repaint_helpers
+from contrib.cluster_telemetry import ct_benchmarks_util
+from contrib.cluster_telemetry import page_set
+from contrib.cluster_telemetry import repaint_helpers
+
 from telemetry import benchmark
 from telemetry.core import discover
 from telemetry import story
@@ -23,9 +24,6 @@ def _MatchPageSetName(story_set_name, story_set_base_dir):
   return None
 
 
-# Disabled because we do not plan on running this SKP benchmark on the perf
-# waterfall any time soon.
-@benchmark.Disabled('all')
 @benchmark.Owner(emails=['rmistry@chromium.org'])
 class SkpicturePrinter(perf_benchmark.PerfBenchmark):
 
@@ -58,9 +56,6 @@ class SkpicturePrinter(perf_benchmark.PerfBenchmark):
     return story_set_class()
 
 
-# Disabled because we do not plan on running CT benchmarks on the perf
-# waterfall any time soon.
-@benchmark.Disabled('all')
 class SkpicturePrinterCT(perf_benchmark.PerfBenchmark):
   """Captures SKPs for Cluster Telemetry."""
 
@@ -83,6 +78,6 @@ class SkpicturePrinterCT(perf_benchmark.PerfBenchmark):
     return skpicture_printer.SkpicturePrinter(options.skp_outdir)
 
   def CreateStorySet(self, options):
-    return page_sets.CTPageSet(
+    return page_set.CTPageSet(
         options.urls_list, options.user_agent, options.archive_data_file,
         run_page_interaction_callback=repaint_helpers.WaitThenRepaint)