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

 # 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 os
 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
 
 import gpu_test_base
 
 def _GetGpuDir(*subdirs):
   gpu_dir = os.path.dirname(os.path.dirname(__file__))
   return os.path.join(gpu_dir, *subdirs)
 
 # Unit tests verifying invariants of classes in GpuTestBase.
 
 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,
                         validator.ValidateAndMeasurePage,
                         'Class %s should not override ValidateAndMeasurePage'
                         % 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,
                         page.RunNavigateSteps,
                         'Class %s should not override ValidateAndMeasurePage'
                         % page.__name__)
       self.assertEquals(gpu_test_base.PageBase.RunPageInteractions,
                         page.RunPageInteractions,
                         'Class %s should not override RunPageInteractions'
                         % page.__name__)
@@ skipping 123 matching lines @@
     test.validator.ValidateAndMeasurePageInner = (
       manager.validator.ValidateAndMeasurePageInner)
     test.AddFakePage(page)
     self.assertEqual(test.Run(finder_options), 0,
                      'Test should run with no errors')
     expected = [mock.call.page.RunNavigateStepsInner(mock.ANY),
                 mock.call.page.RunPageInteractionsInner(mock.ANY),
                 mock.call.validator.ValidateAndMeasurePageInner(
                   page, mock.ANY, mock.ANY)]
     self.assertTrue(manager.mock_calls == expected)