Revert of Create classes_util API, change discover to return a list instead of a dict.

tools/telemetry/telemetry/benchmark_runner.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.
 
 """Parses the command line, discovers the appropriate benchmarks, and runs them.
 
 Handles benchmark configuration, but all the logic for
 actually running the benchmark is in Benchmark and PageRunner."""
 
 import hashlib
 import inspect
 import json
 import os
 import sys
 
 from telemetry import benchmark
+from telemetry.core import discover
 from telemetry import decorators
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_options
 from telemetry.internal.util import command_line
-from telemetry.util import classes_util
 
 
 def PrintBenchmarkList(benchmarks, possible_browser, output_pipe=sys.stdout):
   """ Print benchmarks that are not filtered in the same order of benchmarks in
   the |benchmarks| list.
 
   Args:
     benchmarks: the list of benchmarks to be printed (in the same order of the
       list).
     possible_browser: the possible_browser instance that's used for checking
@@ skipping 225 matching lines @@
     yield cls
 
 def _MatchingCommands(string):
   return [command for command in _Commands()
          if command.Name().startswith(string)]
 
 @decorators.Cache
 def _Benchmarks(environment):
   benchmarks = []
   for search_dir in environment.benchmark_dirs:
-    benchmarks += classes_util.DiscoverClasses(search_dir,
+    benchmarks += discover.DiscoverClasses(search_dir,
                                            environment.top_level_dir,
-                                           benchmark.Benchmark)
+                                           benchmark.Benchmark,
+                                           index_by_class_name=True).values()
   return benchmarks
 
 def _MatchBenchmarkName(input_benchmark_name, environment, exact_matches=True):
   def _Matches(input_string, search_string):
     if search_string.startswith(input_string):
       return True
     for part in search_string.split('.'):
       if part.startswith(input_string):
         return True
     return False
@@ skipping 129 matching lines @@
 
   # Parse and run the command.
   parser = command.CreateParser()
   command.AddCommandLineArgs(parser, environment)
   options, args = parser.parse_args()
   if commands:
     args = args[1:]
   options.positional_args = args
   command.ProcessCommandLineArgs(parser, options, environment)
   return command().Run(options)