| Index: components/tracing/child_trace_message_filter.cc
|
| diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
|
| index 3dd1223d643140e67ec30bb63695cd464107d134..194f0972e0328390927304522f2fe91a933ecb3d 100644
|
| --- a/components/tracing/child_trace_message_filter.cc
|
| +++ b/components/tracing/child_trace_message_filter.cc
|
| @@ -15,9 +15,9 @@ using base::trace_event::TraceLog;
|
| namespace tracing {
|
|
|
| ChildTraceMessageFilter::ChildTraceMessageFilter(
|
| - base::MessageLoopProxy* ipc_message_loop)
|
| + base::SingleThreadTaskRunner* ipc_task_runner)
|
| : sender_(NULL),
|
| - ipc_message_loop_(ipc_message_loop),
|
| + ipc_task_runner_(ipc_task_runner),
|
| pending_memory_dump_guid_(0) {
|
| }
|
|
|
| @@ -132,8 +132,9 @@ void ChildTraceMessageFilter::OnCancelWatchEvent() {
|
| }
|
|
|
| void ChildTraceMessageFilter::OnWatchEventMatched() {
|
| - if (!ipc_message_loop_->BelongsToCurrentThread()) {
|
| - ipc_message_loop_->PostTask(FROM_HERE,
|
| + if (!ipc_task_runner_->BelongsToCurrentThread()) {
|
| + ipc_task_runner_->PostTask(
|
| + FROM_HERE,
|
| base::Bind(&ChildTraceMessageFilter::OnWatchEventMatched, this));
|
| return;
|
| }
|
| @@ -143,10 +144,10 @@ void ChildTraceMessageFilter::OnWatchEventMatched() {
|
| void ChildTraceMessageFilter::OnTraceDataCollected(
|
| const scoped_refptr<base::RefCountedString>& events_str_ptr,
|
| bool has_more_events) {
|
| - if (!ipc_message_loop_->BelongsToCurrentThread()) {
|
| - ipc_message_loop_->PostTask(FROM_HERE,
|
| - base::Bind(&ChildTraceMessageFilter::OnTraceDataCollected, this,
|
| - events_str_ptr, has_more_events));
|
| + if (!ipc_task_runner_->BelongsToCurrentThread()) {
|
| + ipc_task_runner_->PostTask(
|
| + FROM_HERE, base::Bind(&ChildTraceMessageFilter::OnTraceDataCollected,
|
| + this, events_str_ptr, has_more_events));
|
| return;
|
| }
|
| if (events_str_ptr->data().size()) {
|
| @@ -163,13 +164,11 @@ void ChildTraceMessageFilter::OnTraceDataCollected(
|
| void ChildTraceMessageFilter::OnMonitoringTraceDataCollected(
|
| const scoped_refptr<base::RefCountedString>& events_str_ptr,
|
| bool has_more_events) {
|
| - if (!ipc_message_loop_->BelongsToCurrentThread()) {
|
| - ipc_message_loop_->PostTask(FROM_HERE,
|
| - base::Bind(&ChildTraceMessageFilter::
|
| - OnMonitoringTraceDataCollected,
|
| - this,
|
| - events_str_ptr,
|
| - has_more_events));
|
| + if (!ipc_task_runner_->BelongsToCurrentThread()) {
|
| + ipc_task_runner_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&ChildTraceMessageFilter::OnMonitoringTraceDataCollected,
|
| + this, events_str_ptr, has_more_events));
|
| return;
|
| }
|
| sender_->Send(new TracingHostMsg_MonitoringTraceDataCollected(
|
|
|