Index: tools/telemetry/telemetry/internal/platform/tracing_controller_backend.py |
diff --git a/tools/telemetry/telemetry/internal/platform/tracing_controller_backend.py b/tools/telemetry/telemetry/internal/platform/tracing_controller_backend.py |
index 96cceae715ef42e843b27c73ed424f69483e394a..ee318bd7a34e1c8f3427aceda7230932c96e13ce 100644 |
--- a/tools/telemetry/telemetry/internal/platform/tracing_controller_backend.py |
+++ b/tools/telemetry/telemetry/internal/platform/tracing_controller_backend.py |
@@ -4,21 +4,20 @@ |
import os |
-from telemetry.core import discover |
from telemetry.core import util |
from telemetry.internal.platform import tracing_agent |
from telemetry.internal.platform.tracing_agent import chrome_tracing_agent |
from telemetry.timeline import trace_data as trace_data_module |
from telemetry.timeline import tracing_category_filter |
from telemetry.timeline import tracing_options |
+from telemetry.util import classes_util |
def _IterAllTracingAgentClasses(): |
tracing_agent_dir = os.path.join( |
os.path.dirname(os.path.realpath(__file__)), 'tracing_agent') |
- return discover.DiscoverClasses( |
- tracing_agent_dir, util.GetTelemetryDir(), |
- tracing_agent.TracingAgent).itervalues() |
+ return classes_util.DiscoverClasses( |
+ tracing_agent_dir, util.GetTelemetryDir(), tracing_agent.TracingAgent) |
class TracingControllerBackend(object): |