diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:15:14 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:15:14 +0000 |
| commit | a4ecc3d225e129390b8a80ddbee445e31fde2a94 (patch) | |
| tree | 27271c2842597520c794b4e36943793aafd676dc /content/browser/trace_controller.cc | |
| parent | 35d849dc495e21eaceb75badc6541c1d30bffb79 (diff) | |
| download | chromium_src-a4ecc3d225e129390b8a80ddbee445e31fde2a94.zip chromium_src-a4ecc3d225e129390b8a80ddbee445e31fde2a94.tar.gz chromium_src-a4ecc3d225e129390b8a80ddbee445e31fde2a94.tar.bz2 | |
Revert: Internalize JSON chunk merging to trace_event.h API.
BUG=100291
TEST=base_unittests, content_unittests
Review URL: http://codereview.chromium.org/8355024
Review URL: http://codereview.chromium.org/8369021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/trace_controller.cc')
| -rw-r--r-- | content/browser/trace_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/trace_controller.cc b/content/browser/trace_controller.cc index daff2a1..4464a8b 100644 --- a/content/browser/trace_controller.cc +++ b/content/browser/trace_controller.cc @@ -224,19 +224,19 @@ void TraceController::OnEndTracingAck( 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() { |