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

content/test/gpu/gpu_tests/gpu_test_base_unittest.py

Index: content/test/gpu/gpu_tests/gpu_test_base_unittest.py
diff --git a/content/test/gpu/gpu_tests/gpu_test_base_unittest.py b/content/test/gpu/gpu_tests/gpu_test_base_unittest.py
index f1ddf36065f642ce423dc60f0cdc143cdda2f8d9..969202527980efbc5aaf42b15714e079e5eac143 100644
--- a/content/test/gpu/gpu_tests/gpu_test_base_unittest.py
+++ b/content/test/gpu/gpu_tests/gpu_test_base_unittest.py
@@ -5,10 +5,10 @@
 import unittest
 
 from telemetry import benchmark
+from telemetry.core import discover
 from telemetry.core import util
 from telemetry.story import story_set as story_set_module
 from telemetry.testing import fakes
-from telemetry.util import classes_util
 
 util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock')
 import mock # pylint: disable=import-error
@@ -23,8 +23,10 @@
 
 class NoOverridesTest(unittest.TestCase):
   def testValidatorBase(self):
-    all_validators = classes_util.DiscoverClasses(
-      _GetGpuDir('gpu_tests'), _GetGpuDir(), gpu_test_base.ValidatorBase)
+    all_validators = discover.DiscoverClasses(
+      _GetGpuDir('gpu_tests'), _GetGpuDir(),
+      gpu_test_base.ValidatorBase,
+      index_by_class_name=True).values()
     self.assertGreater(len(all_validators), 0)
     for validator in all_validators:
       self.assertEquals(gpu_test_base.ValidatorBase.ValidateAndMeasurePage,
@@ -33,8 +35,10 @@
                         % validator.__name__)
 
   def testPageBase(self):
-    all_pages = classes_util.DiscoverClasses(
-      _GetGpuDir(), _GetGpuDir(), gpu_test_base.PageBase)
+    all_pages = discover.DiscoverClasses(
+      _GetGpuDir(), _GetGpuDir(),
+      gpu_test_base.PageBase,
+      index_by_class_name=True).values()
     self.assertGreater(len(all_pages), 0)
     for page in all_pages:
       self.assertEquals(gpu_test_base.PageBase.RunNavigateSteps,