Quickly close tabs/window with long-running unload handlers.

content/browser/web_contents/web_contents_impl.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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 385 matching lines @@
   if (GetNativeView()) {
     RenderViewHost* host = GetRenderViewHost();
     if (host && host->GetView())
       RenderWidgetHostViewPort::FromRWHV(host->GetView())->WillWmDestroy();
   }
 #endif
 
   // OnCloseStarted isn't called in unit tests.
   if (!close_start_time_.is_null()) {
     base::TimeTicks now = base::TimeTicks::Now();
+    base::TimeDelta close_time = now - close_start_time_;
+    UMA_HISTOGRAM_TIMES("Tab.Close", close_time);
+
     base::TimeTicks unload_start_time = close_start_time_;
+    base::TimeTicks unload_end_time = now;
     if (!before_unload_end_time_.is_null())
       unload_start_time = before_unload_end_time_;
-    UMA_HISTOGRAM_TIMES("Tab.Close", now - close_start_time_);
-    UMA_HISTOGRAM_TIMES("Tab.Close.UnloadTime", now - unload_start_time);
+    if (!unload_detached_start_time_.is_null())
+      unload_end_time = unload_detached_start_time_;
+    base::TimeDelta unload_time = unload_end_time - unload_start_time;
+    UMA_HISTOGRAM_TIMES("Tab.Close.UnloadTime", unload_time);
   }
 
   FOR_EACH_OBSERVER(WebContentsObserver,
                     observers_,
                     WebContentsImplDestroyed());
 
   SetDelegate(NULL);
 }
 
 WebContentsImpl* WebContentsImpl::Create(
@@ skipping 1368 matching lines @@
 
 base::TimeTicks WebContentsImpl::GetNewTabStartTime() const {
   return new_tab_start_time_;
 }
 
 void WebContentsImpl::Close() {
   Close(GetRenderViewHost());
 }
 
 void WebContentsImpl::OnCloseStarted() {
-  if (close_start_time_.is_null())
+  if (close_start_time_.is_null()) {
     close_start_time_ = base::TimeTicks::Now();
+  }
+}
+
+void WebContentsImpl::OnUnloadDetachedStarted() {
+  if (unload_detached_start_time_.is_null()) {
+    unload_detached_start_time_ = base::TimeTicks::Now();
+  }
 }
 
 bool WebContentsImpl::ShouldAcceptDragAndDrop() const {
 #if defined(OS_CHROMEOS)
   // ChromeOS panels (pop-ups) do not take drag-n-drop.
   // See http://crosbug.com/2413
   if (delegate_ && delegate_->IsPopupOrPanel(this))
     return false;
   return true;
 #else
@@ skipping 1546 matching lines @@
                                      bool success,
                                      const string16& user_input) {
   if (is_showing_before_unload_dialog_ && !success) {
     // If a beforeunload dialog is canceled, we need to stop the throbber from
     // spinning, since we forced it to start spinning in Navigate.
     DidStopLoading(rvh);
     controller_.DiscardNonCommittedEntries();
 
     close_start_time_ = base::TimeTicks();
     before_unload_end_time_ = base::TimeTicks();
+    unload_detached_start_time_ = base::TimeTicks();
   }
   is_showing_before_unload_dialog_ = false;
   static_cast<RenderViewHostImpl*>(
       rvh)->JavaScriptDialogClosed(reply_msg, success, user_input);
 }
 
 void WebContentsImpl::SetEncoding(const std::string& encoding) {
   encoding_ = content::GetContentClient()->browser()->
       GetCanonicalEncodingNameByAliasName(encoding);
 }
@@ skipping 51 matching lines @@
   }
 }
 
 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
   return browser_plugin_guest_.get();
 }
 
 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
   return browser_plugin_embedder_.get();
 }