Add new multipage_skpicture_printer benchmark and measurement

tools/perf/benchmarks/multipage_skpicture_printer.py

Index: tools/perf/benchmarks/multipage_skpicture_printer.py
diff --git a/tools/perf/benchmarks/skpicture_printer.py b/tools/perf/benchmarks/multipage_skpicture_printer.py
similarity index 66%
copy from tools/perf/benchmarks/skpicture_printer.py
copy to tools/perf/benchmarks/multipage_skpicture_printer.py
index 3ca6602e6dbc117c1a9b27472ebea29839fd90e1..329ebf66027a9a433e1aa920c8bac74214bc212d 100644
--- a/tools/perf/benchmarks/skpicture_printer.py
+++ b/tools/perf/benchmarks/multipage_skpicture_printer.py
@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2016 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.
 
@@ -10,7 +10,7 @@ from telemetry import benchmark
 from telemetry.core import discover
 from telemetry import story
 
-from measurements import skpicture_printer
+from measurements import multipage_skpicture_printer
 
 
 def _MatchPageSetName(story_set_name, story_set_base_dir):
@@ -22,15 +22,17 @@ def _MatchPageSetName(story_set_name, story_set_base_dir):
   return None
 
 
+# Disabled because we do not plan on running this mSKP benchmark on the perf
+# waterfall any time soon.
 @benchmark.Disabled('all')
-class SkpicturePrinter(perf_benchmark.PerfBenchmark):
+class MultipageSkpicturePrinter(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')
+    parser.add_option('-m', '--mskp-outdir',
+                      help='Output directory for the mSKP files')
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
@@ -38,15 +40,16 @@ class SkpicturePrinter(perf_benchmark.PerfBenchmark):
       parser.error('Please specify --page-set-name')
     if not args.page_set_base_dir:
       parser.error('Please specify --page-set-base-dir')
-    if not args.skp_outdir:
-      parser.error('Please specify --skp-outdir')
+    if not args.mskp_outdir:
+      parser.error('Please specify --mskp-outdir')
 
   @classmethod
   def Name(cls):
-    return 'skpicture_printer'
+    return 'multipage_skpicture_printer'
 
   def CreatePageTest(self, options):
-    return skpicture_printer.SkpicturePrinter(options.skp_outdir)
+    return multipage_skpicture_printer.MultipageSkpicturePrinter(
+        options.mskp_outdir)
 
   def CreateStorySet(self, options):
     story_set_class = _MatchPageSetName(options.page_set_name,
@@ -57,26 +60,27 @@ class SkpicturePrinter(perf_benchmark.PerfBenchmark):
 # 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."""
+class MultipageSkpicturePrinterCT(perf_benchmark.PerfBenchmark):
+  """Captures mSKPs for Cluster Telemetry."""
 
   @classmethod
   def Name(cls):
-    return 'skpicture_printer_ct'
+    return 'multipage_skpicture_printer_ct'
 
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, parser):
     ct_benchmarks_util.AddBenchmarkCommandLineArgs(parser)
-    parser.add_option('-s', '--skp-outdir',
+    parser.add_option('-m', '--mskp-outdir',
                       default=None,
-                      help='Output directory for the SKP files')
+                      help='Output directory for the mSKP files')
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
     ct_benchmarks_util.ValidateCommandLineArgs(parser, args)
 
   def CreatePageTest(self, options):
-    return skpicture_printer.SkpicturePrinter(options.skp_outdir)
+    return multipage_skpicture_printer.MultipageSkpicturePrinter(
+        options.mskp_outdir)
 
   def CreateStorySet(self, options):
     return page_sets.CTPageSet(