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

tools/perf/contrib/cluster_telemetry/skpicture_printer.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # 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
 
-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
 
 from measurements import skpicture_printer
 
 
 def _MatchPageSetName(story_set_name, story_set_base_dir):
   story_sets = discover.DiscoverClasses(story_set_base_dir, story_set_base_dir,
                                         story.StorySet).values()
   for s in story_sets:
     if story_set_name == s.Name():
       return s
   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):
 
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, parser):
     parser.add_option('--page-set-name',  action='store', type='string')
     parser.add_option('--page-set-base-dir', action='store', type='string')
     parser.add_option('-s', '--skp-outdir',
                       help='Output directory for the SKP files')
 
@@ skipping 12 matching lines @@
 
   def CreatePageTest(self, options):
     return skpicture_printer.SkpicturePrinter(options.skp_outdir)
 
   def CreateStorySet(self, options):
     story_set_class = _MatchPageSetName(options.page_set_name,
                                         options.page_set_base_dir)
     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."""
 
   @classmethod
   def Name(cls):
     return 'skpicture_printer_ct'
 
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, parser):
     ct_benchmarks_util.AddBenchmarkCommandLineArgs(parser)
     parser.add_option('-s', '--skp-outdir',
                       default=None,
                       help='Output directory for the SKP files')
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
     ct_benchmarks_util.ValidateCommandLineArgs(parser, args)
 
   def CreatePageTest(self, options):
     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)