diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 16:34:08 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 16:34:08 +0000 |
| commit | 91ea6343d74a2cd7457d2a8b1521e3fd4724d7f5 (patch) | |
| tree | c28b5e27b1d369c35405b53f603e7a9796089ac8 /content/browser/trace_controller.cc | |
| parent | 7d1208ce239e0298f016e6839f25551975de2269 (diff) | |
| download | chromium_src-91ea6343d74a2cd7457d2a8b1521e3fd4724d7f5.zip chromium_src-91ea6343d74a2cd7457d2a8b1521e3fd4724d7f5.tar.gz chromium_src-91ea6343d74a2cd7457d2a8b1521e3fd4724d7f5.tar.bz2 | |
Internalize JSON chunk merging to trace_event.h API (retry).
Original review: http://codereview.chromium.org/8355024/
BUG=100291
TEST=base_unittests, content_unittests
Review URL: http://codereview.chromium.org/8373018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106924 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 4464a8b..daff2a1 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>& - json_events_str_ptr) { + 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), json_events_str_ptr)); + base::Unretained(this), events_str_ptr)); return; } // Drop trace events if we are just getting categories. if (subscriber_ && !is_get_categories_) - subscriber_->OnTraceDataCollected(json_events_str_ptr->data); + subscriber_->OnTraceDataCollected(events_str_ptr->data); } void TraceController::OnTraceBufferFull() { |