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 2ca4738857a0c9e97c7b525bf1e7ecbdb8721c7c..faddaf252d4cd40b91b555256d675b25cf507345 100644 |
--- a/content/browser/tracing/tracing_controller_impl.cc |
+++ b/content/browser/tracing/tracing_controller_impl.cc |
@@ -8,6 +8,7 @@ |
#include "base/files/file_util.h" |
#include "base/guid.h" |
#include "base/json/string_escape.h" |
+#include "base/logging.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted_memory.h" |
#include "base/strings/string_number_conversions.h" |
@@ -42,8 +43,7 @@ |
#endif |
#if defined(OS_CHROMEOS) |
-#include "chromeos/dbus/dbus_thread_manager.h" |
-#include "chromeos/dbus/debug_daemon_client.h" |
+#include "chrome/browser/chromeos/trace/sys_trace_agent.h" |
#endif |
#if defined(OS_WIN) |
@@ -279,15 +279,11 @@ bool TracingControllerImpl::StartTracing( |
#endif |
#if defined(OS_CHROMEOS) |
- chromeos::DebugDaemonClient* debug_daemon = |
- chromeos::DBusThreadManager::Get()->GetDebugDaemonClient(); |
- if (debug_daemon) { |
- debug_daemon->StartAgentTracing( |
- trace_config, |
- base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked, |
- base::Unretained(this))); |
- ++pending_start_tracing_ack_count_; |
- } |
+ chromeos::SysTraceAgent::GetInstance()->StartAgentTracing( |
+ trace_config, |
+ base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked, |
+ base::Unretained(this))); |
+ ++pending_start_tracing_ack_count_; |
#elif defined(OS_WIN) |
EtwTracingAgent::GetInstance()->StartAgentTracing( |
trace_config, |
@@ -598,11 +594,10 @@ void TracingControllerImpl::RemoveTraceMessageFilter( |
void TracingControllerImpl::AddTracingAgent(const std::string& agent_name) { |
#if defined(OS_CHROMEOS) |
- auto* debug_daemon = |
- chromeos::DBusThreadManager::Get()->GetDebugDaemonClient(); |
- if (agent_name == debug_daemon->GetTracingAgentName()) { |
- additional_tracing_agents_.push_back(debug_daemon); |
- debug_daemon->SetStopAgentTracingTaskRunner( |
+ auto* cros_trace_agent = chromeos::SysTraceAgent::GetInstance(); |
+ if (agent_name == cros_trace_agent->GetTracingAgentName()) { |
+ additional_tracing_agents_.push_back(cros_trace_agent); |
+ cros_trace_agent->SetStopAgentTracingTaskRunner( |
BrowserThread::GetBlockingPool()); |
return; |
} |