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 734 matching lines @@
   WebContents* inspected_web_contents = GetInspectedWebContents();
   if (inspected_web_contents) {
     inspected_web_contents->GetDelegate()->AddNewContents(
         source, new_contents, disposition, initial_pos, user_gesture,
         was_blocked);
   }
 }
 
 void DevToolsWindow::CloseContents(WebContents* source) {
   CHECK(is_docked_);
+  // Do this first so that when GetDockedInstanceForInspectedTab is called
+  // from UpdateDevTools it won't return this instance
+  // see crbug.com/372504
+  content::DevToolsManager::GetInstance()->ClientHostClosing(
+      bindings_->frontend_host());
   // This will prevent any activity after frontend is loaded.
   action_on_load_ = DevToolsToggleAction::NoOp();
   ignore_set_is_docked_ = true;
   // Update dev tools to reflect removed dev tools window.
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateDevTools();
   // In case of docked web_contents_, we own it so delete here.
   // Embedding DevTools window will be deleted as a result of
   // WebContentsDestroyed callback.
@@ skipping 250 matching lines @@
 
 InfoBarService* DevToolsWindow::GetInfoBarService() {
   return is_docked_ ?
       InfoBarService::FromWebContents(GetInspectedWebContents()) :
       InfoBarService::FromWebContents(web_contents_);
 }
 
 void DevToolsWindow::RenderProcessGone() {
   // 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_);
 }
 
 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);
@@ skipping 126 matching lines @@
       closure.Run();
     return;
   }
   load_completed_callback_ = closure;
 }
 
 bool DevToolsWindow::ForwardKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return event_forwarder_->ForwardEvent(event);
 }