[tools/perf] Enable many more lint checks for perf directory.

tools/perf/benchmarks/benchmark_smoke_unittest.py

 # Copyright 2014 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.
 
 """Run the first page of one benchmark for every module.
 
 Only benchmarks that have a composable measurement are included.
 Ideally this test would be comprehensive, however, running one page
 of every benchmark would run impractically long.
 """
@@ skipping 80 matching lines @@
     spaceport,  # Takes 451 seconds.
     speedometer,  # Takes 101 seconds.
     jetstream,  # Take 206 seconds.
     text_selection,  # Always fails on cq bot.
     kraken,  # Flaky on Android, crbug.com/626174.
     v8_browsing, # Flaky on Android, crbug.com/628368.
     battor #Flaky on android, crbug.com/618330.
 }
 
 
+def MergeDecorators(method, method_attribute, benchmark, benchmark_attribute):
+  # Do set union of attributes to eliminate duplicates.
+  merged_attributes = getattr(method, method_attribute, set()).union(
+      getattr(benchmark, benchmark_attribute, set()))
+  if merged_attributes:
+    setattr(method, method_attribute, merged_attributes)
+
+
 def load_tests(loader, standard_tests, pattern):
   del loader, standard_tests, pattern  # unused
   suite = progress_reporter.TestSuite()
 
   benchmarks_dir = os.path.dirname(__file__)
   top_level_dir = os.path.dirname(benchmarks_dir)
 
   # Using the default of |index_by_class_name=False| means that if a module
   # has multiple benchmarks, only the last one is returned.
   all_benchmarks = discover.DiscoverClasses(
@@ skipping 29 matching lines @@
     except AttributeError:
       enabled_benchmark_attr = '_enabled_strings'
       enabled_method_attr = '_enabled_strings'
       disabled_benchmark_attr = '_disabled_strings'
       disabled_method_attr = '_disabled_strings'
     else:
       disabled_benchmark_attr = decorators.DisabledAttributeName(benchmark)
       disabled_method_attr = decorators.DisabledAttributeName(method)
       enabled_benchmark_attr = decorators.EnabledAttributeName(benchmark)
       enabled_method_attr = decorators.EnabledAttributeName(method)
-    # Merge decorators.
-    def MergeDecorators(method_attribute, benchmark_attribute):
-      # Do set union of attributes to eliminate duplicates.
-      merged_attributes = getattr(method, method_attribute, set()).union(
-          getattr(benchmark, benchmark_attribute, set()))
-      if merged_attributes:
-        setattr(method, method_attribute, merged_attributes)
 
-    MergeDecorators(disabled_method_attr, disabled_benchmark_attr)
-    MergeDecorators(enabled_method_attr, enabled_benchmark_attr)
+    MergeDecorators(method, disabled_method_attr, benchmark,
+                    disabled_benchmark_attr)
+    MergeDecorators(method, enabled_method_attr, benchmark,
+                    enabled_benchmark_attr)
 
     setattr(BenchmarkSmokeTest, benchmark.Name(), method)
 
     suite.addTest(BenchmarkSmokeTest(benchmark.Name()))
 
   return suite