ThreadWatcher - Disarm the StartupTimeBomb, if we haven't started

chrome/browser/metrics/thread_watcher.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/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 421 matching lines @@
       unresponsive_threshold(unresponsive_threshold) {
 }
 
 ThreadWatcherList::CrashDataThresholds::CrashDataThresholds()
     : live_threads_threshold(kLiveThreadsThreshold),
       unresponsive_threshold(kUnresponsiveCount) {
 }
 
 // static
 void ThreadWatcherList::StartWatchingAll(const CommandLine& command_line) {
-  // TODO(rtenneti): Enable ThreadWatcher.
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   uint32 unresponsive_threshold;
   CrashOnHangThreadMap crash_on_hang_threads;
   ParseCommandLine(command_line,
                    &unresponsive_threshold,
                    &crash_on_hang_threads);
 
   ThreadWatcherObserver::SetupNotifications(
       base::TimeDelta::FromSeconds(kSleepSeconds * unresponsive_threshold));
 
   WatchDogThread::PostTask(
       FROM_HERE,
       base::Bind(&ThreadWatcherList::SetStopped, false));
 
-  WatchDogThread::PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&ThreadWatcherList::InitializeAndStartWatching,
-                 unresponsive_threshold,
-                 crash_on_hang_threads),
-      base::TimeDelta::FromSeconds(g_initialize_delay_seconds));
+  if (!WatchDogThread::PostDelayedTask(
+          FROM_HERE,
+          base::Bind(&ThreadWatcherList::InitializeAndStartWatching,
+                     unresponsive_threshold,
+                     crash_on_hang_threads),
+          base::TimeDelta::FromSeconds(g_initialize_delay_seconds))) {
+    // Disarm() the startup timebomb, if we couldn't post the task to start the
+    // ThreadWatcher (becasue WatchDog thread is not running).
+    StartupTimeBomb::DisarmStartupTimeBomb();
+  }
 }
 
 // static
 void ThreadWatcherList::StopWatchingAll() {
   // TODO(rtenneti): Enable ThreadWatcher.
   ThreadWatcherObserver::RemoveNotifications();
   DeleteAll();
 }
 
 // static
@@ skipping 605 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }