Added command line switches "crash-on-hang-threads" and "crash-on-hang-seconds"

chrome/browser/browser_main.cc

 // Copyright (c) 2011 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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1419 matching lines @@
   InitializeNetworkOptions(parsed_command_line);
   InitializeURLRequestThrottlerManager(browser_process->net_log());
 
   // Initialize histogram synchronizer system. This is a singleton and is used
   // for posting tasks via NewRunnableMethod. Its deleted when it goes out of
   // scope. Even though NewRunnableMethod does AddRef and Release, the object
   // will not be deleted after the Task is executed.
   scoped_refptr<HistogramSynchronizer> histogram_synchronizer(
       new HistogramSynchronizer());
 
-  // Initialize thread watcher system. This is a singleton and is used by
-  // WatchDogThread to keep track of information about threads that are being
-  // watched.
-  scoped_ptr<ThreadWatcherList> thread_watcher_list(new ThreadWatcherList());
-
   // Now the command line has been mutated based on about:flags, we can
   // set up metrics and initialize field trials.
   MetricsService* metrics = parts->SetupMetricsAndFieldTrials(
       parsed_command_line, local_state);
 
   // Now that all preferences have been registered, set the install date
   // for the uninstall metrics if this is our first run. This only actually
   // gets used if the user has metrics reporting enabled at uninstall time.
   int64 install_date =
       local_state->GetInt64(prefs::kUninstallMetricsInstallDate);
@@ skipping 431 matching lines @@
   // Schedule a GPU blacklist auto update.  This also loads the current one.
   scoped_refptr<GpuBlacklistUpdater> gpu_blacklist_updater =
       new GpuBlacklistUpdater();
   // Don't start auto update in tests.
   if (parsed_command_line.GetSwitchValueASCII(switches::kUseGL) !=
           gfx::kGLImplementationOSMesaName) {
     gpu_blacklist_updater->StartAfterDelay();
   }
 
   // Start watching all browser threads for responsiveness.
-  ThreadWatcherList::StartWatchingAll();
+  ThreadWatcherList::StartWatchingAll(parsed_command_line);
 
   int result_code = ResultCodes::NORMAL_EXIT;
   if (parameters.ui_task) {
     // We are in test mode. Run one task and enter the main message loop.
     if (pool)
       pool->Recycle();
     parameters.ui_task->Run();
     delete parameters.ui_task;
   } else {
     // Most general initialization is behind us, but opening a
@@ skipping 96 matching lines @@
 #if defined(OS_CHROMEOS)
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return result_code;
 }