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

tools/perf/benchmarks/rasterize_and_record_micro.py

Index: tools/perf/benchmarks/rasterize_and_record_micro.py
diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py
index d1fbbe0c04bd79f870249ca29ad22f133b39bb4f..507f0a0b7d4d4d204e2cb023bbeeb8f2c2eb49f7 100644
--- a/tools/perf/benchmarks/rasterize_and_record_micro.py
+++ b/tools/perf/benchmarks/rasterize_and_record_micro.py
@@ -56,11 +56,10 @@ class RasterizeAndRecordMicroTop25(_RasterizeAndRecordMicro):
 
   @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.
 
@@ -69,7 +68,7 @@ class RasterizeAndRecordMicroKeyMobileSites(_RasterizeAndRecordMicro):
 
   @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