Revert: Internalize JSON chunk merging to trace_event.h API.

content/browser/trace_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/trace_controller.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/trace_message_filter.h"
@@ skipping 206 matching lines @@
     std::vector<std::string> categories;
     base::debug::TraceLog::GetInstance()->GetKnownCategories(&categories);
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TraceController::OnEndTracingAck, base::Unretained(this),
                    categories));
   }
 }
 
 void TraceController::OnTraceDataCollected(
     const scoped_refptr<base::debug::TraceLog::RefCountedString>&
-        events_str_ptr) {
+        json_events_str_ptr) {
   // OnTraceDataCollected may be called from any browser thread, either by the
   // local event trace system or from child processes via TraceMessageFilter.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TraceController::OnTraceDataCollected,
-                   base::Unretained(this), events_str_ptr));
+                   base::Unretained(this), json_events_str_ptr));
     return;
   }
 
   // Drop trace events if we are just getting categories.
   if (subscriber_ && !is_get_categories_)
-    subscriber_->OnTraceDataCollected(events_str_ptr->data);
+    subscriber_->OnTraceDataCollected(json_events_str_ptr->data);
 }
 
 void TraceController::OnTraceBufferFull() {
   // OnTraceBufferFull may be called from any browser thread, either by the
   // local event trace system or from child processes via TraceMessageFilter.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TraceController::OnTraceBufferFull,
                    base::Unretained(this)));
     return;
@@ skipping 26 matching lines @@
   if (pending_bpf_ack_count_ == 1) {
     // The last ack represents local trace, so we need to ack it now. Note that
     // this code only executes if there were child processes.
     float bpf = base::debug::TraceLog::GetInstance()->GetBufferPercentFull();
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TraceController::OnTraceBufferPercentFullReply,
                    base::Unretained(this), bpf));
   }
 }