DevTools: fix DevTools Window lifetime with fast_unload_controller

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/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 169 matching lines @@
     : public content::WebContentsObserver {
  public:
   explicit FrontendWebContentsObserver(DevToolsWindow* window);
   virtual ~FrontendWebContentsObserver();
 
  private:
   // contents::WebContentsObserver:
   virtual void AboutToNavigateRenderView(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DocumentOnLoadCompletedInMainFrame(int32 page_id) OVERRIDE;
+  virtual void WebContentsDestroyed(content::WebContents*) OVERRIDE;
 
   DevToolsWindow* devtools_window_;
   DISALLOW_COPY_AND_ASSIGN(FrontendWebContentsObserver);
 };
 
 DevToolsWindow::FrontendWebContentsObserver::FrontendWebContentsObserver(
     DevToolsWindow* devtools_window)
     : WebContentsObserver(devtools_window->web_contents()),
       devtools_window_(devtools_window) {
 }
 
+void DevToolsWindow::FrontendWebContentsObserver::WebContentsDestroyed(
+    content::WebContents* contents) {
+  delete devtools_window_;
+}
+
 DevToolsWindow::FrontendWebContentsObserver::~FrontendWebContentsObserver() {
 }
 
 void DevToolsWindow::FrontendWebContentsObserver::AboutToNavigateRenderView(
     content::RenderViewHost* render_view_host) {
   content::DevToolsClientHost::SetupDevToolsFrontendClient(render_view_host);
 }
 
 void DevToolsWindow::FrontendWebContentsObserver::
     DocumentOnLoadCompletedInMainFrame(int32 page_id) {
@@ skipping 39 matching lines @@
   file_system_value->SetString("rootURL", file_system.root_url);
   file_system_value->SetString("fileSystemPath", file_system.file_system_path);
   return file_system_value;
 }
 
 }  // namespace
 
 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
 
 DevToolsWindow::~DevToolsWindow() {
+  content::DevToolsManager::GetInstance()->ClientHostClosing(
+      frontend_host_.get());
+  UpdateBrowserToolbar();
+
   DevToolsWindows* instances = &g_instances.Get();
   DevToolsWindows::iterator it(
       std::find(instances->begin(), instances->end(), this));
   DCHECK(it != instances->end());
   instances->erase(it);
 
   for (IndexingJobsMap::const_iterator jobs_it(indexing_jobs_.begin());
        jobs_it != indexing_jobs_.end(); ++jobs_it) {
     jobs_it->second->Stop();
   }
@@ skipping 324 matching lines @@
 
   g_instances.Get().push_back(this);
 
   // Wipe out page icon so that the default application icon is used.
   content::NavigationEntry* entry =
       web_contents_->GetController().GetActiveEntry();
   entry->GetFavicon().image = gfx::Image();
   entry->GetFavicon().valid = true;
 
   // Register on-load actions.
-  content::Source<content::NavigationController> nav_controller_source(
-      &web_contents_->GetController());
-  registrar_.Add(this, chrome::NOTIFICATION_TAB_CLOSING, nav_controller_source);
   registrar_.Add(
       this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(profile_)));
 
   // There is no inspected_rvh in case of shared workers.
   if (inspected_rvh)
     inspected_contents_observer_.reset(new InspectedWebContentsObserver(
         content::WebContents::FromRenderViewHost(inspected_rvh)));
 
@@ skipping 116 matching lines @@
     return DEVTOOLS_DOCK_SIDE_RIGHT;
   if (dock_side == kDockSideBottom)
     return DEVTOOLS_DOCK_SIDE_BOTTOM;
   return (dock_side == kDockSideMinimized) ?
       DEVTOOLS_DOCK_SIDE_MINIMIZED : DEVTOOLS_DOCK_SIDE_UNDOCKED;
 }
 
 void DevToolsWindow::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_TAB_CLOSING) {
-    if (content::Source<content::NavigationController>(source).ptr() ==
-        &web_contents_->GetController()) {
-      // This happens when browser closes all of its tabs as a result
-      // of window.Close event.
-      // Notify manager that this DevToolsClientHost no longer exists and
-      // initiate self-destuct here.
-      content::DevToolsManager::GetInstance()->ClientHostClosing(
-          frontend_host_.get());
-      UpdateBrowserToolbar();
-      delete this;
-    }
-  } else {
-    DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
-    UpdateTheme();
-  }
+  DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
+  UpdateTheme();
 }
 
 content::WebContents* DevToolsWindow::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
   if (!params.url.SchemeIs(chrome::kChromeDevToolsScheme)) {
     content::WebContents* inspected_web_contents = GetInspectedWebContents();
     return inspected_web_contents ?
         inspected_web_contents->OpenURL(params) : NULL;
   }
@@ skipping 31 matching lines @@
   }
 }
 
 void DevToolsWindow::CloseContents(content::WebContents* source) {
   CHECK(IsDocked());
   // 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.
   delete web_contents_;
-
-  delete this;
 }
 
 void DevToolsWindow::BeforeUnloadFired(content::WebContents* tab,
                                        bool proceed,
                                        bool* proceed_to_fire_unload) {
   if (proceed) {
     content::DevToolsManager::GetInstance()->ClientHostClosing(
         frontend_host_.get());
   }
   *proceed_to_fire_unload = proceed;
@@ skipping 583 matching lines @@
   return inspected_contents_observer_ ?
       inspected_contents_observer_->web_contents() : NULL;
 }
 
 void DevToolsWindow::DocumentOnLoadCompletedInMainFrame() {
   is_loaded_ = true;
   UpdateTheme();
   DoAction();
   AddDevToolsExtensionsToClient();
 }