[Telemetry] Allows concatenating multiple Disabled & Enabled decorators

tools/perf/benchmarks/maps.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.
 
 """Runs a Google Maps performance test.
 Rerforms several common navigation actions on the map (pan, zoom, rotate)"""
 
 import re
 
 from core import path_util
@@ skipping 27 matching lines @@
         url='http://localhost:10020/tracker.html',
         page_set=page_set,
         base_dir=base_dir,
         make_javascript_deterministic=False)
 
   def RunNavigateSteps(self, action_runner):
     super(MapsPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForJavaScriptCondition('window.testDone')
 
 
-@benchmark.Disabled
+@benchmark.Disabled('all')
 class MapsBenchmark(perf_benchmark.PerfBenchmark):
   """Basic Google Maps benchmarks."""
   test = _MapsMeasurement
 
   @classmethod
   def Name(cls):
     return 'maps'
 
   def CreateStorySet(self, options):
     ps = story.StorySet(archive_data_file='data/maps.json',
                         base_dir=path_util.GetStorySetsDir(),
                         cloud_storage_bucket=story.PUBLIC_BUCKET)
     ps.AddStory(MapsPage(ps, ps.base_dir))
     return ps
 
 class MapsNoVsync(MapsBenchmark):
   """Runs the Google Maps benchmark with Vsync disabled"""
   tag = 'novsync'
 
   @classmethod
   def Name(cls):
     return 'maps.novsync'
 
   def SetExtraBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--disable-gpu-vsync')