Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(566)

Unified Diff: telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py

Issue 2692763002: Revert of [Telemetry] Switch clients to new JavaScript API (batch 5) (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py
diff --git a/telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py b/telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py
index c592d872a0e8cd1490c332a2d5fa527db15bfb94..c46c281d6f2663f05391fa124fa88fd301dddbfc 100644
--- a/telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py
+++ b/telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent.py
@@ -153,11 +153,12 @@
for backend in self._IterInspectorBackends():
try:
timestamp = trace_time.Now()
- event = 'ClockSyncEvent.%s' % sync_id
- backend.EvaluateJavaScript2(
- "console.time({{ event }});", event=event)
- backend.EvaluateJavaScript2(
- "console.timeEnd({{ event }});", event=event)
+ # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+ backend.EvaluateJavaScript(
+ "console.time('ClockSyncEvent.%s');" % sync_id)
+ # TODO(catapult:#3028): Fix interpolation of JavaScript values.
+ backend.EvaluateJavaScript(
+ "console.timeEnd('ClockSyncEvent.%s');" % sync_id)
has_clock_synced = True
break
except Exception:
@@ -313,14 +314,14 @@
% self._platform_backend)
for backend in self._IterInspectorBackends():
- backend.EvaluateJavaScript2("console.time('flush-tracing');")
+ backend.EvaluateJavaScript("console.time('flush-tracing');")
self.StopAgentTracing()
self.CollectAgentTraceData(trace_data_builder)
self.StartAgentTracing(config, timeout)
for backend in self._IterInspectorBackends():
- backend.EvaluateJavaScript2("console.timeEnd('flush-tracing');")
+ backend.EvaluateJavaScript("console.timeEnd('flush-tracing');")
def _IterInspectorBackends(self):
for client in chrome_tracing_devtools_manager.GetDevToolsClients(

Powered by Google App Engine
This is Rietveld 408576698