Rename rasterize_and_record_micro.key_mobile_sites{_smooth,} and top_25{_smooth,}

tools/perf/benchmarks/rasterize_and_record_micro.py

 # Copyright 2013 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
 from measurements import rasterize_and_record_micro
 import page_sets
 from telemetry import benchmark
@@ skipping 38 matching lines @@
 @benchmark.Disabled('mac', 'win',
                     'android')  # http://crbug.com/610018
 class RasterizeAndRecordMicroTop25(_RasterizeAndRecordMicro):
   """Measures rasterize and record performance on the top 25 web pages.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   page_set = page_sets.Top25PageSet
 
   @classmethod
   def Name(cls):
-    return 'rasterize_and_record_micro.top_25_smooth'
+    return 'rasterize_and_record_micro.top_25'
 
 
-@benchmark.Disabled('mac', 'win',
-                    'android')  # http://crbug.com/531597
+@benchmark.Disabled('mac', 'win', 'android')  # http://crbug.com/531597
 class RasterizeAndRecordMicroKeyMobileSites(_RasterizeAndRecordMicro):
   """Measures rasterize and record performance on the key mobile sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
   page_set = page_sets.KeyMobileSitesPageSet
 
   @classmethod
   def Name(cls):
-    return 'rasterize_and_record_micro.key_mobile_sites_smooth'
+    return 'rasterize_and_record_micro.key_mobile_sites'
 
 
 @benchmark.Disabled('mac', 'win', 'android') # http://crbug.com/610424
 class RasterizeAndRecordMicroKeySilkCases(_RasterizeAndRecordMicro):
   """Measures rasterize and record performance on the silk sites.
 
   http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
 
   @classmethod
   def Name(cls):
@@ skipping 46 matching lines @@
     _RasterizeAndRecordMicro.AddBenchmarkCommandLineArgs(parser)
     ct_benchmarks_util.AddBenchmarkCommandLineArgs(parser)
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
     ct_benchmarks_util.ValidateCommandLineArgs(parser, args)
 
   def CreateStorySet(self, options):
     return page_sets.CTPageSet(
         options.urls_list, options.user_agent, options.archive_data_file)