| Index: content/browser/tracing/tracing_controller_impl.cc
|
| diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc
|
| index c0b503dd0e1dce0fe75cfb2036628030fbcc4bfe..70edf234be4be8849a0883912a32216293d48130 100644
|
| --- a/content/browser/tracing/tracing_controller_impl.cc
|
| +++ b/content/browser/tracing/tracing_controller_impl.cc
|
| @@ -252,8 +252,7 @@ bool TracingControllerImpl::StartTracing(
|
| }
|
|
|
| void TracingControllerImpl::OnStartAgentTracingDone(
|
| - const TraceConfig& trace_config,
|
| - const StartTracingDoneCallback& callback) {
|
| + const TraceConfig& trace_config) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| TRACE_EVENT_API_ADD_METADATA_EVENT("IsTimeTicksHighResolution", "value",
|
| @@ -267,10 +266,10 @@ void TracingControllerImpl::OnStartAgentTracingDone(
|
| it->get()->SendBeginTracing(trace_config);
|
| }
|
|
|
| - if (!callback.is_null())
|
| - callback.Run();
|
| -
|
| - start_tracing_done_callback_.Reset();
|
| + if (!start_tracing_done_callback_.is_null()) {
|
| + start_tracing_done_callback_.Run();
|
| + start_tracing_done_callback_.Reset();
|
| + }
|
| }
|
|
|
| bool TracingControllerImpl::StopTracing(
|
| @@ -883,8 +882,7 @@ bool TracingControllerImpl::StartAgentTracing(
|
|
|
| base::Closure on_start_tracing_done_callback =
|
| base::Bind(&TracingControllerImpl::OnStartAgentTracingDone,
|
| - base::Unretained(this),
|
| - trace_config, start_tracing_done_callback_);
|
| + base::Unretained(this), trace_config);
|
| if (!BrowserThread::PostTask(
|
| BrowserThread::FILE, FROM_HERE,
|
| base::Bind(&TracingControllerImpl::SetEnabledOnFileThread,
|
|
|