In Canary, crash the browser if shutdown takes longer

than 45 secs (and for XP crash if it takes longer than
90 secs).

BUG=95506
TEST=shutdown
R=jar
Review URL: http://codereview.chromium.org/7782017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99900 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browser_main.cc

@@ -1847,7 +1847,7 @@ int ChromeBrowserMainParts::TemporaryContinue() {
 
   // Start watching for jank during shutdown. It gets disarmed when
   // |shutdown_watcher_| object is destructed.
-  shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(25));
+  shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(45));
 
 #if defined(OS_WIN)
   // If it's the first run, log the search engine chosen.  We wait until

chrome/browser/metrics/thread_watcher.cc

@@ -734,6 +734,12 @@ void ShutdownWatcherHelper::Arm(const base::TimeDelta& duration) {
   } else if (channel == chrome::VersionInfo::CHANNEL_BETA ||
              channel == chrome::VersionInfo::CHANNEL_DEV) {
     actual_duration *= 25;
+  } else {
+    // In Canary, for Windows XP, give twice the time for shutdown.
+#if defined(OS_WIN)
+    if (base::win::GetVersion() <= base::win::VERSION_XP)
+      actual_duration *= 2;
+#endif
   }
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();