Index: content/browser/tracing/etw_system_event_consumer_win.cc |
diff --git a/content/browser/tracing/etw_system_event_consumer_win.cc b/content/browser/tracing/etw_system_event_consumer_win.cc |
index 07dfd4db7b8da16d2ce9a4162544d13ff4ee643f..de2426d9546915f7c9437afc1d9139630c5c0f2b 100644 |
--- a/content/browser/tracing/etw_system_event_consumer_win.cc |
+++ b/content/browser/tracing/etw_system_event_consumer_win.cc |
@@ -11,6 +11,7 @@ |
#include "base/lazy_instance.h" |
#include "base/memory/singleton.h" |
#include "base/strings/stringprintf.h" |
+#include "base/thread_task_runner_handle.h" |
#include "base/time/time.h" |
#include "base/trace_event/trace_event_impl.h" |
#include "content/public/browser/browser_thread.h" |
@@ -49,11 +50,15 @@ std::string EtwSystemEventConsumer::GetTraceEventLabel() { |
return kETWTraceLabel; |
} |
-bool EtwSystemEventConsumer::StartAgentTracing( |
- const base::trace_event::TraceConfig& trace_config) { |
+void EtwSystemEventConsumer::StartAgentTracing( |
+ const base::trace_event::TraceConfig& trace_config, |
+ const StartAgentTracingCallback& callback) { |
// Activate kernel tracing. |
- if (!StartKernelSessionTracing()) |
- return false; |
+ if (!StartKernelSessionTracing()) { |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, base::Bind(callback, GetTracingAgentName(), false)); |
stevenjb
2016/01/26 20:11:19
/* success */
charliea (OOO until 10-5)
2016/01/26 20:29:56
Done.
|
+ return; |
+ } |
// Start the consumer thread and start consuming events. |
thread_.Start(); |
@@ -62,7 +67,8 @@ bool EtwSystemEventConsumer::StartAgentTracing( |
base::Bind(&EtwSystemEventConsumer::TraceAndConsumeOnThread, |
base::Unretained(this))); |
- return true; |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, base::Bind(callback, GetTracingAgentName(), true)); |
stevenjb
2016/01/26 20:11:19
/* success */
charliea (OOO until 10-5)
2016/01/26 20:29:56
Done.
|
} |
void EtwSystemEventConsumer::StopAgentTracing( |