Crash when trying to close chrome://inspect

chrome/browser/ui/webui/inspect_ui.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/ui/webui/inspect_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 379 matching lines @@
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::NotificationService::AllSources());
 }
 
 InspectUI::~InspectUI() {
-  observer_->InspectUIDestroyed();
-  observer_ = NULL;
+  StopListeningNotifications();
 }
 
 void InspectUI::RefreshUI() {
   web_ui()->CallJavascriptFunction("populateLists");
 }
 
 void InspectUI::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
+  if (source == content::Source<WebContents>(web_ui()->GetWebContents())) {
+    if (type == content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED)
+        StopListeningNotifications();
+    return;
+  }
   RefreshUI();
 }
+
+void InspectUI::StopListeningNotifications()
+{
+  if (!observer_)
+    return;
+  observer_->InspectUIDestroyed();
+  observer_ = NULL;
+  registrar_.RemoveAll();
+}