Index: content/browser/devtools/render_view_devtools_agent_host.cc |
diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc |
index 62355fae4b7c50b3ae2430046e84c25548c612d2..e85ee923ac963e839c1aa27ba038d2ad87edae4d 100644 |
--- a/content/browser/devtools/render_view_devtools_agent_host.cc |
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc |
@@ -12,7 +12,6 @@ |
#include "content/browser/devtools/devtools_power_handler.h" |
#include "content/browser/devtools/devtools_protocol.h" |
#include "content/browser/devtools/devtools_protocol_constants.h" |
-#include "content/browser/devtools/devtools_tracing_handler.h" |
#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h" |
#include "content/browser/devtools/renderer_overrides_handler.h" |
#include "content/browser/renderer_host/render_process_host_impl.h" |
@@ -112,21 +111,21 @@ RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) |
: render_view_host_(NULL), |
input_handler_(new devtools::input::InputHandler()), |
page_handler_(new devtools::page::PageHandler()), |
+ tracing_handler_(new devtools::tracing::TracingHandler( |
+ devtools::tracing::TracingHandler::Renderer)), |
handler_impl_(new DevToolsProtocolHandlerImpl()), |
overrides_handler_(new RendererOverridesHandler()), |
- tracing_handler_( |
- new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)), |
power_handler_(new DevToolsPowerHandler()), |
reattaching_(false) { |
handler_impl_->SetInputHandler(input_handler_.get()); |
handler_impl_->SetPageHandler(page_handler_.get()); |
+ handler_impl_->SetTracingHandler(tracing_handler_.get()); |
SetRenderViewHost(rvh); |
DevToolsProtocol::Notifier notifier(base::Bind( |
&RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend, |
base::Unretained(this))); |
handler_impl_->SetNotifier(notifier); |
overrides_handler_->SetNotifier(notifier); |
- tracing_handler_->SetNotifier(notifier); |
power_handler_->SetNotifier(notifier); |
g_instances.Get().push_back(this); |
AddRef(); // Balanced in RenderViewHostDestroyed. |
@@ -161,8 +160,6 @@ void RenderViewDevToolsAgentHost::DispatchProtocolMessage( |
if (!overridden_response.get()) |
overridden_response = overrides_handler_->HandleCommand(command); |
if (!overridden_response.get()) |
- overridden_response = tracing_handler_->HandleCommand(command); |
- if (!overridden_response.get()) |
overridden_response = power_handler_->HandleCommand(command); |
if (!overridden_response.get()) |
overridden_response = handler_impl_->HandleCommand(command); |
@@ -217,7 +214,7 @@ void RenderViewDevToolsAgentHost::OnClientDetached() { |
power_save_blocker_.reset(); |
#endif |
overrides_handler_->OnClientDetached(); |
- tracing_handler_->OnClientDetached(); |
+ tracing_handler_->Detached(); |
power_handler_->OnClientDetached(); |
ClientDetachedFromRenderer(); |