Revert of Reland "Switch telemetry over to use typ to run the unit tests."

tools/telemetry/telemetry/unittest/run_tests_unittest.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 unittest
 
+from telemetry import decorators
 from telemetry.core import util
 from telemetry.unittest import run_tests
 
 
-class MockArgs(object):
-  def __init__(self):
-    self.positional_args = []
-    self.exact_test_filter = True
-    self.run_disabled_tests = False
-
-
 class MockPossibleBrowser(object):
   def __init__(self, browser_type, os_name, os_version_name,
                supports_tab_control):
     self.browser_type = browser_type
     self.platform = MockPlatform(os_name, os_version_name)
     self.supports_tab_control = supports_tab_control
 
 
 class MockPlatform(object):
   def __init__(self, os_name, os_version_name):
     self.os_name = os_name
     self.os_version_name = os_version_name
 
   def GetOSName(self):
     return self.os_name
 
   def GetOSVersionName(self):
     return self.os_version_name
 
 
 class RunTestsUnitTest(unittest.TestCase):
 
+  def setUp(self):
+    self.suite = unittest.TestSuite()
+    self.suite.addTests(run_tests.Discover(
+        util.GetTelemetryDir(), util.GetTelemetryDir(), 'disabled_cases.py'))
+
   def _GetEnabledTests(self, browser_type, os_name, os_version_name,
                        supports_tab_control):
+    # pylint: disable=W0212
+    def MockPredicate(test):
+      method = getattr(test, test._testMethodName)
+      return decorators.IsEnabled(method, MockPossibleBrowser(
+          browser_type, os_name, os_version_name, supports_tab_control))
 
-    runner = run_tests.typ.Runner()
-    host  = runner.host
-    runner.top_level_dir = util.GetTelemetryDir()
-    runner.args.tests = [host.join(util.GetTelemetryDir(),
-        'telemetry', 'unittest', 'disabled_cases.py')]
-    possible_browser = MockPossibleBrowser(
-        browser_type, os_name, os_version_name, supports_tab_control)
-    runner.classifier = run_tests.GetClassifier(MockArgs(), possible_browser)
-    _, test_set = runner.find_tests(runner.args)
-    return set(test.name.split('.')[-1] for test in test_set.parallel_tests)
+    enabled_tests = set()
+    for i in run_tests.FilterSuite(self.suite, MockPredicate)._tests:
+      for j in i:
+        for k in j:
+          enabled_tests.add(k._testMethodName)
+    return enabled_tests
 
   def testSystemMacMavericks(self):
     self.assertEquals(
         set(['testAllEnabled',
              'testMacOnly',
              'testMavericksOnly',
              'testNoChromeOS',
              'testNoWinLinux',
              'testSystemOnly',
              'testHasTabs']),
@@ skipping 34 matching lines @@
 
   def testDoesntHaveTabs(self):
     self.assertEquals(
         set(['testAllEnabled',
              'testNoChromeOS',
              'testNoMac',
              'testNoMavericks',
              'testNoSystem',
              'testWinOrLinuxOnly']),
         self._GetEnabledTests('canary', 'win', 'win7', False))