Rendezvous to hung browser will again offer to kill it.

chrome/browser/process_singleton_win.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/process_singleton.h"
 
 #include <shellapi.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/chrome_process_finder_win.h"
 #include "chrome/browser/metro_utils/metro_chrome_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/installer/util/wmi.h"
+#include "components/browser_watcher/exit_funnel_win.h"
 #include "content/public/common/result_codes.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 namespace {
 
 const char kLockfile[] = "lockfile";
 
 const int kMetroChromeActivationTimeoutMs = 3000;
@@ skipping 204 matching lines @@
     return PROCESS_NONE;
   }
 
   switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
     case chrome::NOTIFY_SUCCESS:
       return PROCESS_NOTIFIED;
     case chrome::NOTIFY_FAILED:
       remote_window_ = NULL;
       return PROCESS_NONE;
     case chrome::NOTIFY_WINDOW_HUNG:
-      remote_window_ = NULL;
+      // Record a hung rendezvous event in this process' exit funnel.
+      browser_watcher::ExitFunnel::RecordSingleEvent(
+          chrome::kBrowserExitCodesRegistryPath, L"RendezvousToHungBrowser");
       break;
   }
 
   DWORD process_id = 0;
   DWORD thread_id = ::GetWindowThreadProcessId(remote_window_, &process_id);
   if (!thread_id || !process_id) {
     remote_window_ = NULL;
     return PROCESS_NONE;
   }
   base::Process process = base::Process::Open(process_id);
 
   // The window is hung. Scan for every window to find a visible one.
   bool visible_window = false;
   ::EnumThreadWindows(thread_id,
                       &BrowserWindowEnumeration,
                       reinterpret_cast<LPARAM>(&visible_window));
 
   // If there is a visible browser window, ask the user before killing it.
   if (visible_window &&
       chrome::ShowMessageBox(
           NULL,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
           l10n_util::GetStringUTF16(IDS_BROWSER_HUNGBROWSER_MESSAGE),
           chrome::MESSAGE_BOX_TYPE_QUESTION) == chrome::MESSAGE_BOX_RESULT_NO) {
     // The user denied. Quit silently.
     return PROCESS_NOTIFIED;
   }
 
+  // Record the termination event in the hung process' exit funnel.
+  browser_watcher::ExitFunnel funnel;
+  if (funnel.Init(chrome::kBrowserExitCodesRegistryPath, process.Handle()))
+    funnel.RecordEvent(L"HungBrowserTerminated");
+
   // Time to take action. Kill the browser process.
   base::KillProcess(process.Handle(), content::RESULT_CODE_HUNG, true);
   remote_window_ = NULL;
   return PROCESS_NONE;
 }
 
 ProcessSingleton::NotifyResult
 ProcessSingleton::NotifyOtherProcessOrCreate() {
   ProcessSingleton::NotifyResult result = PROCESS_NONE;
   if (!Create()) {
@@ skipping 123 matching lines @@
           ::SetEvent(metro_activation_event.Get());
       }
     }
   }
 
   return window_.hwnd() != NULL;
 }
 
 void ProcessSingleton::Cleanup() {
 }