DevTools: reattach to previous RVH when pending navigation is being canceled

content/browser/debugger/devtools_manager.cc

Index: content/browser/debugger/devtools_manager.cc
diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc
index 82a7c0904c0f7b1ef0006bb412170e26d0cea944..11b661f95c76a0bf69b400d8d3b8ba9a6a81729f 100644
--- a/content/browser/debugger/devtools_manager.cc
+++ b/content/browser/debugger/devtools_manager.cc
@@ -160,6 +160,15 @@ void DevToolsManager::OnNavigatingToPendingEntry(RenderViewHost* rvh,
   }
 }
 
+void DevToolsManager::OnCancelPendingNavigation(RenderViewHost* pending,
+                                                RenderViewHost* current) {
+  int cookie = DetachClientHost(pending);
+  if (cookie != -1) {
+    // Navigating to URL in the inspected window.
+    AttachClientHost(cookie, current);
+  }
+}
+
 void DevToolsManager::TabReplaced(TabContents* old_tab,
                                   TabContents* new_tab) {
   RenderViewHost* old_rvh = old_tab->render_view_host();