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

tools/telemetry/telemetry/internal/util/find_dependencies.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.
 
 import fnmatch
 import imp
 import logging
 import modulefinder
 import optparse
 import os
 import sys
 import zipfile
 
 from catapult_base import cloud_storage
 from telemetry import benchmark
+from telemetry.core import discover
 from telemetry.internal.util import bootstrap
 from telemetry.internal.util import command_line
 from telemetry.internal.util import path
 from telemetry.internal.util import path_set
-from telemetry.util import classes_util
-
 
 DEPS_FILE = 'bootstrap_deps'
 
 
 def FindBootstrapDependencies(base_dir):
   deps_file = os.path.join(base_dir, DEPS_FILE)
   if not os.path.exists(deps_file):
     return []
   deps_paths = bootstrap.ListAllDepsPaths(deps_file)
   return set(os.path.realpath(os.path.join(
@@ skipping 24 matching lines @@
       continue
 
     yield module_path
 
 
 def FindPageSetDependencies(base_dir):
   logging.info('Finding page sets in %s' % base_dir)
 
   # Add base_dir to path so our imports relative to base_dir will work.
   sys.path.append(base_dir)
-  tests = classes_util.DiscoverClasses(base_dir, base_dir, benchmark.Benchmark)
+  tests = discover.DiscoverClasses(base_dir, base_dir, benchmark.Benchmark,
+                                   index_by_class_name=True)
 
-  for test_class in tests:
+  for test_class in tests.itervalues():
     test_obj = test_class()
 
     # Ensure the test's default options are set if needed.
     parser = optparse.OptionParser()
     test_obj.AddCommandLineArgs(parser, None)
     options = optparse.Values()
     for k, v in parser.get_default_values().__dict__.iteritems():
       options.ensure_value(k, v)
 
     # Page set paths are relative to their runner script, not relative to us.
@@ skipping 164 matching lines @@
 
   def Run(self, args):
     target_paths = args.positional_args
     dependencies = FindDependencies(target_paths, args)
     if args.zip:
       ZipDependencies(target_paths, dependencies, args)
       print 'Zip archive written to %s.' % args.zip
     else:
       print '\n'.join(sorted(dependencies))
     return 0