Index: tools/telemetry/telemetry/core/platform.py |
diff --git a/tools/telemetry/telemetry/core/platform.py b/tools/telemetry/telemetry/core/platform.py |
index c04433f92b542412e898d7b3059705c7c64397ca..5a4d750f340d708c96f0be15946743918eea9b5f 100644 |
--- a/tools/telemetry/telemetry/core/platform.py |
+++ b/tools/telemetry/telemetry/core/platform.py |
@@ -4,11 +4,11 @@ |
import logging as real_logging |
import os |
+from telemetry.core import discover |
from telemetry.core import network_controller |
from telemetry.core import tracing_controller |
from telemetry.core import util |
from telemetry.internal.platform import platform_backend as platform_backend_module |
-from telemetry.util import classes_util |
_host_platform = None |
@@ -39,9 +39,9 @@ |
def _IterAllPlatformBackendClasses(): |
platform_dir = os.path.dirname( |
os.path.realpath(platform_backend_module.__file__)) |
- return classes_util.DiscoverClasses( |
+ return discover.DiscoverClasses( |
platform_dir, util.GetTelemetryDir(), |
- platform_backend_module.PlatformBackend) |
+ platform_backend_module.PlatformBackend).itervalues() |
def GetPlatformForDevice(device, finder_options, logging=real_logging): |