Revert of Add blink_perf.paint_spinvalidation and blink_perf.svg_spinvalidation suites

tools/perf/benchmarks/blink_perf.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.
 
 import os
 
 from core import path_util
 from core import perf_benchmark
 
 from telemetry import benchmark
@@ skipping 101 matching lines @@
       units = parts[-1]
       metric = page.display_name.split('.')[0].replace('/', '_')
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           results.current_page, metric, units, values))
 
       break
 
     print log
 
 
-class _BlinkPerfMeasurementSlimmingPaintInvalidation(_BlinkPerfMeasurement):
-  """Measures blink perf with the new paint invalidation system (see:
-  https://goo.gl/eQczQW). The benchmarks using this measurement should be
-  removed when slimming paint invalidation ships."""
-  def CustomizeBrowserOptions(self, options):
-    _BlinkPerfMeasurement.CustomizeBrowserOptions(self, options)
-    options.AppendExtraBrowserArgs([
-        '--enable-blink-features=SlimmingPaintInvalidation'
-    ])
-
-
 class _BlinkPerfBenchmark(perf_benchmark.PerfBenchmark):
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.' + cls.tag
 
   def CreateStorySet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, self.subdir)
     return CreateStorySetFromPath(path, SKIPPED_FILE)
@@ skipping 79 matching lines @@
 
 class BlinkPerfPaint(_BlinkPerfBenchmark):
   tag = 'paint'
   subdir = 'Paint'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/574483
 
 
-class BlinkPerfPaintSlimmingPaintInvalidation(BlinkPerfPaint):
-  tag = 'paint_slimmingpaintinvalidation'
-  test = _BlinkPerfMeasurementSlimmingPaintInvalidation
-
-
 @benchmark.Disabled('win')  # crbug.com/488493
 class BlinkPerfParser(_BlinkPerfBenchmark):
   tag = 'parser'
   subdir = 'Parser'
 
 
 class BlinkPerfSVG(_BlinkPerfBenchmark):
   tag = 'svg'
   subdir = 'SVG'
 
 
-class BlinkPerfSVGSlimmingPaintInvalidation(BlinkPerfSVG):
-  tag = 'svg_slimmingpaintinvalidation'
-  test = _BlinkPerfMeasurementSlimmingPaintInvalidation
-
-
 class BlinkPerfShadowDOM(_BlinkPerfBenchmark):
   tag = 'shadow_dom'
   subdir = 'ShadowDOM'
 
 
 # This benchmark is for local testing, doesn't need to run on bots.
 @benchmark.Disabled('all')
 class BlinkPerfXMLHttpRequest(_BlinkPerfBenchmark):
   tag = 'xml_http_request'
   subdir = 'XMLHttpRequest'
@@ skipping 14 matching lines @@
 
   def CreateStorySet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, self.subdir)
     return CreateStorySetFromPath(
         path, SKIPPED_FILE,
         shared_page_state_class=_SharedPywebsocketPageState)
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/551950