| Index: content/browser/devtools/render_frame_devtools_agent_host.cc
|
| diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| index 4f55898ee15a0b8ee58fc3a026da5f969ea23973..aff7a85840f6fb0c2fbda29449ddbc8ee91e8abc 100644
|
| --- a/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| +++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| @@ -543,7 +543,7 @@ bool RenderFrameDevToolsAgentHost::DispatchProtocolMessage(
|
| const std::string& message) {
|
| int call_id = 0;
|
| std::string method;
|
| - if (session->Dispatch(message, true, &call_id, &method) !=
|
| + if (session->Dispatch(message, &call_id, &method) !=
|
| protocol::Response::kFallThrough) {
|
| return true;
|
| }
|
| @@ -928,10 +928,13 @@ void RenderFrameDevToolsAgentHost::
|
| void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
|
| RenderFrameHostImpl* host) {
|
| #if DCHECK_IS_ON()
|
| - // Check that we don't have stale host object here by accessing some random
|
| - // properties inside.
|
| - if (handlers_frame_host_ && handlers_frame_host_->GetRenderWidgetHost())
|
| - handlers_frame_host_->GetRenderWidgetHost()->GetRoutingID();
|
| + // TODO(dgozman): fix this for browser side navigation.
|
| + if (!IsBrowserSideNavigationEnabled()) {
|
| + // Check that we don't have stale host object here by accessing some random
|
| + // properties inside.
|
| + if (handlers_frame_host_ && handlers_frame_host_->GetRenderWidgetHost())
|
| + handlers_frame_host_->GetRenderWidgetHost()->GetRoutingID();
|
| + }
|
| #endif
|
| handlers_frame_host_ = host;
|
| if (session())
|
|
|