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

tools/perf/profile_creators/profile_generator.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.
 
 """Handles generating profiles and transferring them to/from mobile devices."""
 
 import logging
 import optparse
 import os
 import shutil
 import stat
 import sys
 import tempfile
 
 from profile_creators import profile_extender
+from telemetry.core import discover
 from telemetry.core import util
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import browser_options
 from telemetry.internal import story_runner
-from telemetry.util import classes_util
 
 
 def _DiscoverProfileExtenderClasses():
   profile_extenders_dir = os.path.abspath(os.path.join(util.GetBaseDir(),
       os.pardir, 'perf', 'profile_creators'))
   base_dir = os.path.abspath(os.path.join(profile_extenders_dir, os.pardir))
 
-  profile_extenders_unfiltered = classes_util.DiscoverClassesByClassName(
+  profile_extenders_unfiltered = discover.DiscoverClasses(
       profile_extenders_dir, base_dir, profile_extender.ProfileExtender)
 
   # Remove 'extender' suffix from keys.
   profile_extenders = {}
   for test_name, test_class in profile_extenders_unfiltered.iteritems():
     assert test_name.endswith('_extender')
     test_name = test_name[:-len('_extender')]
     profile_extenders[test_name] = test_class
   return profile_extenders
 
@@ skipping 153 matching lines @@
   ProcessCommandLineArgs(parser, options)
 
   # Generate profile.
   profile_extenders = _DiscoverProfileExtenderClasses()
   profile_extender_class = profile_extenders[options.profile_type_to_generate]
 
   generator = ProfileGenerator(profile_extender_class,
       options.profile_type_to_generate)
   generator.Create(options, options.output_dir)
   return 0