Increased the unresponsive threshold from 6 to 12 in beta

chrome/browser/metrics/thread_watcher.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/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/debug/alias.h"
 #include "base/string_tokenizer.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/common/notification_service.h"
 
 #if defined(OS_WIN)
-#include <Objbase.h>
+#include "base/win/windows_version.h"
 #endif
 
 // static
 const int ThreadWatcher::kPingCount = 6;
 
 // ThreadWatcher methods and members.
 ThreadWatcher::ThreadWatcher(const BrowserThread::ID& thread_id,
                              const std::string& thread_name,
                              const base::TimeDelta& sleep_time,
                              const base::TimeDelta& unresponsive_time,
@@ skipping 380 matching lines @@
 }
 
 // static
 void ThreadWatcherList::ParseCommandLine(
     const CommandLine& command_line,
     uint32* unresponsive_threshold,
     std::set<std::string>* crash_on_hang_thread_names,
     uint32* live_threads_threshold) {
   // Determine |unresponsive_threshold| based on switches::kCrashOnHangSeconds.
   *unresponsive_threshold = kUnresponsiveCount;
+
+  if (chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_BETA) {
+    // Increase the unresponsive_threshold in Beta channel to reduce the number
+    // of crashes due to ThreadWatcher.
+    *unresponsive_threshold *= 2;
+  } else {
+    // In Canary and Dev channels, for Windows XP (old systems), double the
+    // unresponsive_threshold to give OS a chance to schedule UI/IO threads a
+    // time slice to respond with a pong message (to get around limitations with
+    // the OS).
+#if defined(OS_WIN)
+    if (base::win::GetVersion() <= base::win::VERSION_XP)
+      *unresponsive_threshold *= 2;
+#endif
+  }
+
   std::string crash_on_hang_seconds =
       command_line.GetSwitchValueASCII(switches::kCrashOnHangSeconds);
   if (!crash_on_hang_seconds.empty()) {
     int crash_seconds = atoi(crash_on_hang_seconds.c_str());
     if (crash_seconds > 0) {
       *unresponsive_threshold = static_cast<uint32>(
           ceil(static_cast<float>(crash_seconds) / kUnresponsiveSeconds));
     }
   }
 
@@ skipping 228 matching lines @@
 
   base::AutoLock lock(lock_);
   CHECK(!watchdog_thread_);
   watchdog_thread_ = this;
 }
 
 void WatchDogThread::CleanUp() {
   base::AutoLock lock(lock_);
   watchdog_thread_ = NULL;
 }