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

content/browser/tab_contents/render_view_host_manager.cc

Index: content/browser/tab_contents/render_view_host_manager.cc
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 61b084b3f1f2e202b565eeb9e652a7dc0a8193a9..593933a9bed3c634268d3473c331cfc247504c57 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
@@ -746,6 +747,12 @@ void RenderViewHostManager::CancelPending() {
   RenderViewHost* pending_render_view_host = pending_render_view_host_;
   pending_render_view_host_ = NULL;
 
+  DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
+  if (devtools_manager) {  // NULL in unit tests.
+      devtools_manager->OnCancelPendingNavigation(pending_render_view_host,

[pfeldman, 2011/11/15 17:03:35]

Looks good to me. Please make sure jam@ is fine with this one.

+                                                  render_view_host_);
+  }
+
   // We no longer need to prevent the process from exiting.
   pending_render_view_host->process()->RemovePendingView();