Move blink_perf.xml_http_request benchmark to tools/perf/contrib/ directory

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 base64
 import gzip
 import io
 import json
 import logging
 import os
 import platform
 import subprocess
 import tempfile
 import urllib
 import urllib2
 
 
+from core import benchmark_finders
 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
 
 
 # Unsupported Perf bisect bots.
 EXCLUDED_BOTS = {
     'win_xp_perf_bisect',  # Goma issues: crbug.com/330900
     'win_perf_bisect_builder',
     'win64_nv_tester',
     'winx64_bisect_builder',
@@ skipping 230 matching lines @@
          'options available except the --browser option'),
         formatter_class=argparse.RawTextHelpFormatter)
     return parser
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, options, extra_args, environment):
     del environment  # unused
     for arg in extra_args:
       if arg == '--browser' or arg.startswith('--browser='):
         parser.error('--browser=... is not allowed when running trybot.')
-    all_benchmarks = discover.DiscoverClasses(
-        start_dir=path_util.GetPerfBenchmarksDir(),
-        top_level_dir=path_util.GetPerfDir(),
-        base_class=benchmark.Benchmark).values()
+    all_benchmarks = benchmark_finders.GetAllPerfBenchmarks()
+    all_benchmarks.extend(benchmark_finders.GetAllContribBenchmarks())
     all_benchmark_names = [b.Name() for b in all_benchmarks]
     all_benchmarks_by_names = {b.Name(): b for b in all_benchmarks}
     benchmark_class = all_benchmarks_by_names.get(options.benchmark_name, None)
     if not benchmark_class:
       possible_benchmark_names = matching.GetMostLikelyMatchedObject(
           all_benchmark_names, options.benchmark_name)
       parser.error(
           'No benchmark named "%s". Do you mean any of those benchmarks '
           'below?\n%s' % (
               options.benchmark_name, '\n'.join(possible_benchmark_names)))
@@ skipping 348 matching lines @@
     # Add deps overrides to git try --properties arg.
     if deps_override:
       git_try_command.extend([
           '-p', 'deps_revision_overrides=%s' % json.dumps(deps_override)])
       error_msg_on_fail += ' with DEPS override (%s)' % deps_override
     for bot in self._builder_names[bot_platform]:
       git_try_command.extend(['-b', bot])
 
     RunGit(git_try_command, error_msg_on_fail)
     print 'Perf Try job sent to rietveld for %s platform.' % bot_platform