Manually roll src/third_party/catapult/ 2fae0f4ce..2d5cfe52d (3 commits).

tools/perf/core/trybot_command.py

 # Copyright 2015 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 argparse
 import os
 import logging
 import platform
 import re
 import subprocess
 import urllib2
 import json
 
 from core import path_util
 
 from telemetry import benchmark
+from telemetry import decorators
 from telemetry.core import discover
 from telemetry.util import command_line
 from telemetry.util import matching
 
 
 CHROMIUM_CONFIG_FILENAME = 'tools/run-perf-test.cfg'
 BLINK_CONFIG_FILENAME = 'Tools/run-perf-test.cfg'
 SUCCESS, NO_CHANGES, ERROR = range(3)
 # Unsupported Perf bisect bots.
 EXCLUDED_BOTS = {
@@ skipping 195 matching lines @@
     It should never be the case that the benchmark will be enabled on the test
     platform but this method returns True.
 
     Returns:
       A tuple (is_benchmark_disabled, reason) whereas |is_benchmark_disabled| is
       a boolean that tells whether we are sure that the benchmark will be
       disabled, and |reason| is a string that shows the reason why we think the
       benchmark is disabled for sure.
     """
     benchmark_name = benchmark_class.Name()
-    benchmark_disabled_strings = set()
-    if hasattr(benchmark_class, '_disabled_strings'):
-      # pylint: disable=protected-access
-      benchmark_disabled_strings = benchmark_class._disabled_strings
-      # pylint: enable=protected-access
+    benchmark_disabled_strings = decorators.GetDisabledAttributes(
+        benchmark_class)
     if 'all' in benchmark_disabled_strings:
       return True, 'Benchmark %s is disabled on all platform.' % benchmark_name
     if trybot_name == 'all':
       return False, ''
     trybot_platform = _GetBotPlatformFromTrybotName(trybot_name)
     if trybot_platform in benchmark_disabled_strings:
       return True, (
           "Benchmark %s is disabled on %s, and trybot's platform is %s." %
           (benchmark_name, ', '.join(benchmark_disabled_strings),
            trybot_platform))
-    benchmark_enabled_strings = None
-    if hasattr(benchmark_class, '_enabled_strings'):
-      # pylint: disable=protected-access
-      benchmark_enabled_strings = benchmark_class._enabled_strings
-      # pylint: enable=protected-access
+    benchmark_enabled_strings = decorators.GetEnabledAttributes(benchmark_class)
     if (benchmark_enabled_strings and
         trybot_platform not in benchmark_enabled_strings and
         'all' not in benchmark_enabled_strings):
       return True, (
           "Benchmark %s is only enabled on %s, and trybot's platform is %s." %
           (benchmark_name, ', '.join(benchmark_enabled_strings),
            trybot_platform))
     if benchmark_class.ShouldDisable != benchmark.Benchmark.ShouldDisable:
       logging.warning(
           'Benchmark %s has ShouldDisable() method defined. If your trybot run '
@@ skipping 241 matching lines @@
         return ERROR  # pylint: disable=lost-exception
       logging.info('Checked out original branch: %s', original_branchname)
       returncode, out, err = _RunProcess(
           [_GIT_CMD, 'branch', '-D', 'telemetry-tryjob'])
       if returncode:
         logging.error('Could not delete telemetry-tryjob branch. '
                       'Please delete it manually: %s', err)
         return ERROR  # pylint: disable=lost-exception
       logging.info('Deleted temp branch: telemetry-tryjob')
     return SUCCESS