DevTools: Fixed handling of unexpected renderer termination

chrome/browser/devtools/devtools_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
@@ skipping 1002 matching lines @@
   web_contents_->GetRenderViewHost()->ClosePage();
 }
 
 InfoBarService* DevToolsWindow::GetInfoBarService() {
   return is_docked_ ?
       InfoBarService::FromWebContents(GetInspectedWebContents()) :
       InfoBarService::FromWebContents(web_contents_);
 }
 
 void DevToolsWindow::RenderProcessGone() {
+  // Do this first so that when GetDockedInstanceForInspectedTab is called
+  // from CloseContents it won't return this instance
+  // see crbug.com/372504
+  content::DevToolsManager::GetInstance()->ClientHostClosing(
+      bindings_->frontend_host());
   // Docked DevToolsWindow owns its web_contents_ and must delete it.
   // Undocked web_contents_ are owned and handled by browser.
+  // see crbug.com/369932
   if (is_docked_)
     CloseContents(web_contents_);

[pfeldman, 2014/05/15 14:23:51]

Lets put it into CloseContents.

 }
 
 void DevToolsWindow::OnLoadCompleted() {
   // First seed inspected tab id for extension APIs.
   WebContents* inspected_web_contents = GetInspectedWebContents();
   if (inspected_web_contents) {
     SessionTabHelper* session_tab_helper =
         SessionTabHelper::FromWebContents(inspected_web_contents);
     if (session_tab_helper) {
       base::FundamentalValue tabId(session_tab_helper->session_id().id());
@@ skipping 124 matching lines @@
       closure.Run();
     return;
   }
   load_completed_callback_ = closure;
 }
 
 bool DevToolsWindow::ForwardKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return event_forwarder_->ForwardEvent(event);
 }