Ignore DevTools messages from the old inspected RVH after navigation

content/browser/devtools/render_view_devtools_agent_host.cc

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 e6982e32335e49abedbd57982cdf814b84d55697..393bee2fc9e6712c9a8a570e71dea7ce7a8085a3 100644
--- a/content/browser/devtools/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -186,8 +186,9 @@ void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
 void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
   if (!render_view_host_)
     return;
-  msg->set_routing_id(render_view_host_->GetRoutingID());
-  render_view_host_->Send(msg);
+  RenderFrameHost* main_frame_host = render_view_host_->GetMainFrame();
+  msg->set_routing_id(main_frame_host->GetRoutingID());
+  main_frame_host->Send(msg);
 }
 
 void RenderViewDevToolsAgentHost::OnClientAttached() {
@@ -334,11 +335,11 @@ void RenderViewDevToolsAgentHost::RenderProcessGone(
 bool RenderViewDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& message,
     RenderFrameHost* render_frame_host) {
-  return DispatchIPCMessage(message);
-}
-
-bool RenderViewDevToolsAgentHost::OnMessageReceived(
-    const IPC::Message& message) {
+  if (!render_view_host_)
+    return false;
+  if (render_frame_host != render_view_host_->GetMainFrame()) {

[pfeldman, 2014/11/24 13:31:19]

Should we migrate this to render_frame_host_ ?

[yurys, 2014/11/24 14:08:54]

Let's do this in a separate change since there is some RVH specific logic in the
code.

+    return false;
+  }
   return DispatchIPCMessage(message);
 }
 
@@ -452,8 +453,9 @@ bool RenderViewDevToolsAgentHost::Close() {
 
 void RenderViewDevToolsAgentHost::ConnectRenderViewHost(RenderViewHost* rvh) {
   SetRenderViewHost(rvh);
-  if (IsAttached())
+  if (IsAttached()) {

[pfeldman, 2014/11/24 13:31:19]

no need

[yurys, 2014/11/24 14:08:54]

Done.

     Reattach(state_);
+  }
 }
 
 void RenderViewDevToolsAgentHost::DisconnectRenderViewHost() {