Internalize JSON chunk merging to trace_event.h API (retry).

content/common/child_trace_message_filter.cc

Index: content/common/child_trace_message_filter.cc
diff --git a/content/common/child_trace_message_filter.cc b/content/common/child_trace_message_filter.cc
index c6ac09e56c17c7d1b95c7c693c143616e9a156cd..ca280bc8c417f7ff8516ab1d0e09d2910b4f9bef 100644
--- a/content/common/child_trace_message_filter.cc
+++ b/content/common/child_trace_message_filter.cc
@@ -73,16 +73,16 @@ void ChildTraceMessageFilter::OnGetTraceBufferPercentFull() {
 
 void ChildTraceMessageFilter::OnTraceDataCollected(
     const scoped_refptr<base::debug::TraceLog::RefCountedString>&
-        json_events_str_ptr) {
+        events_str_ptr) {
   if (MessageLoop::current() != ChildProcess::current()->io_message_loop()) {
     ChildProcess::current()->io_message_loop()->PostTask(FROM_HERE,
         base::Bind(&ChildTraceMessageFilter::OnTraceDataCollected, this,
-                   json_events_str_ptr));
+                   events_str_ptr));
     return;
   }
 
   channel_->Send(new ChildProcessHostMsg_TraceDataCollected(
-    json_events_str_ptr->data));
+    events_str_ptr->data));
 }
 
 void ChildTraceMessageFilter::OnTraceBufferFull() {