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

tools/perf/contrib/cluster_telemetry/repaint.py

Index: tools/perf/contrib/cluster_telemetry/repaint.py
diff --git a/tools/perf/benchmarks/repaint.py b/tools/perf/contrib/cluster_telemetry/repaint.py
similarity index 84%
rename from tools/perf/benchmarks/repaint.py
rename to tools/perf/contrib/cluster_telemetry/repaint.py
index 3e1852cc9ac9e5d7620a97054f8c95673980d5a4..aad40091b8ba6c5386e9210540f4135da92e4a82 100644
--- a/tools/perf/benchmarks/repaint.py
+++ b/tools/perf/contrib/cluster_telemetry/repaint.py
@@ -2,19 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from core import perf_benchmark
+from contrib.cluster_telemetry import ct_benchmarks_util
+from contrib.cluster_telemetry import page_set

[wkorman, 2017/05/12 17:44:23]

why rename to singular? Just curious.

[nednguyen, 2017/05/12 20:17:03]

Ah, back then page_sets mean to refer to
https://cs.chromium.org/chromium/src/tools/perf/page_sets/ which host many
page_set. Now it's a single module that hosts only cluster_telemetry page_set

+from contrib.cluster_telemetry import repaint_helpers
 
-import ct_benchmarks_util
+from core import perf_benchmark
 from measurements import smoothness
 
-import page_sets
-from page_sets import repaint_helpers
-
-from telemetry import benchmark
 
-# Disabled because we do not plan on running CT benchmarks on the perf
-# waterfall any time soon.
-@benchmark.Disabled('all')
 class RepaintCT(perf_benchmark.PerfBenchmark):
   """Measures repaint performance for Cluster Telemetry."""
 
@@ -41,7 +36,7 @@ class RepaintCT(perf_benchmark.PerfBenchmark):
     ct_benchmarks_util.ValidateCommandLineArgs(parser, args)
 
   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)