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

Unified Diff: content/browser/tracing/tracing_controller_impl.cc

Issue 2400163003: arc: enable Android tracing in verified-boot mode (Closed)
Patch Set: rebase to tot Created 3 years, 8 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
« no previous file with comments | « content/browser/tracing/arc_tracing_agent.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/tracing_controller_impl.cc
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc
index 0bd18de106a8dd1f59c37b3d6af09c32487537ac..47f0c254426a614d6eb27a4f199962970c41de51 100644
--- a/content/browser/tracing/tracing_controller_impl.cc
+++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -598,10 +598,11 @@ void TracingControllerImpl::OnEndAgentTracingAcked(
// The Windows kernel events are kept into a JSON format stored as string
// and must not be escaped.
trace_data_sink_->AddAgentTrace(events_label, events_str_ptr->data());
- } else if (agent_name != kArcTracingAgentName) {
- // ARC trace data is obtained via systrace. Ignore the empty data.
- // Quote other trace data as JSON strings and merge them into
- // |trace_data_sink_|.
+ } else if (agent_name == kArcTracingAgentName) {
+ // The ARC events are kept into a JSON format stored as string
+ // and must not be escaped.
+ trace_data_sink_->AddTraceChunk(events_str_ptr->data());
+ } else {
trace_data_sink_->AddAgentTrace(
events_label, base::GetQuotedJSONString(events_str_ptr->data()));
}
« no previous file with comments | « content/browser/tracing/arc_tracing_agent.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698