Re-enable tab switching flash energy tests.

tools/perf/benchmarks/tab_switching.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 telemetry import benchmark
 
 from measurements import tab_switching
 import page_sets
 
 
@@ skipping 84 matching lines @@
   metric. The pages were chosen by hand to stress the image decoding system.
   """
   test = tab_switching.TabSwitching
   page_set = page_sets.ToughImageCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'tab_switching.tough_image_cases'
 
 
-@benchmark.Disabled  # Just for local testing, not on waterfall.
+@benchmark.Enabled('linux', 'mac', 'win', 'chromeos')
 class TabSwitchingFlashEnergyCases(benchmark.Benchmark):
   test = tab_switching.TabSwitching
   page_set = page_sets.FlashEnergyCasesPageSet
   options = {'pageset_repeat': 10}
+
   @classmethod
   def Name(cls):
     return 'tab_switching.flash_energy_cases'
 
+
+@benchmark.Enabled('linux', 'mac', 'win', 'chromeos')
+class TabSwitchingPluginPowerSaver(benchmark.Benchmark):
+  test = tab_switching.TabSwitching
+  page_set = page_sets.FlashEnergyCasesPageSet
+  options = {'pageset_repeat': 10}
+
+  def CustomizeBrowserOptions(self, options):
+    options.AppendExtraBrowserArgs(['--enable-plugin-power-saver'])
+
+  @classmethod
+  def Name(cls):
+    return 'tab_switching.plugin_power_saver'