Disarm StartupTimeBomb when it is deleted

chrome/browser/metrics/thread_watcher.h

 // 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.
 
 // This file defines a WatchDog thread that monitors the responsiveness of other
 // browser threads like UI, IO, DB, FILE and CACHED threads. It also defines
 // ThreadWatcher class which performs health check on threads that would like to
 // be watched. This file also defines ThreadWatcherList class that has list of
 // all active ThreadWatcher objects.
 //
@@ skipping 38 matching lines @@
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
+#include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/threading/watchdog.h"
 #include "base/time.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class CustomThreadWatcher;
 class StartupTimeBomb;
 class ThreadWatcherList;
@@ skipping 417 matching lines @@
       const base::Closure& task,
       int64 delay_ms);
 
   DISALLOW_COPY_AND_ASSIGN(WatchDogThread);
 };
 
 // This is a wrapper class for getting the crash dumps of the hangs during
 // startup.
 class StartupTimeBomb {
  public:
+  // This singleton is instantiated when the browser process is launched.
+  StartupTimeBomb();
+
+  // Destructor disarm's startup_watchdog_ (if it is arm'ed) so that alarm
+  // doesn't go off.
+  ~StartupTimeBomb();
+
   // Constructs |startup_watchdog_| which spawns a thread and starts timer.
   // |duration| specifies how long |startup_watchdog_| will wait before it
   // calls alarm.
-  static void Arm(const base::TimeDelta& duration);
+  void Arm(const base::TimeDelta& duration);
 
   // Disarms |startup_watchdog_| thread and then deletes it which stops the
   // Watchdog thread.
-  static void Disarm();
+  void Disarm();
+
+  // Disarms |g_startup_timebomb_|.
+  static void DisarmStartupTimeBomb();
 
  private:
+  // The singleton of this class.
+  static StartupTimeBomb* g_startup_timebomb_;
+
   // Watches for hangs during startup until it is disarm'ed.
-  static base::Watchdog* startup_watchdog_;
+  base::Watchdog* startup_watchdog_;
+
+  // The |thread_id_| on which this object is constructed.
+  const base::PlatformThreadId thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupTimeBomb);
 };
 
 // This is a wrapper class for detecting hangs during shutdown.
 class ShutdownWatcherHelper {
  public:
   // Create an empty holder for |shutdown_watchdog_|.
   ShutdownWatcherHelper();
 
   // Destructor disarm's shutdown_watchdog_ so that alarm doesn't go off.
   ~ShutdownWatcherHelper();
 
   // Constructs ShutdownWatchDogThread which spawns a thread and starts timer.
   // |duration| specifies how long it will wait before it calls alarm.
   void Arm(const base::TimeDelta& duration);
 
  private:
   // shutdown_watchdog_ watches for hangs during shutdown.
   base::Watchdog* shutdown_watchdog_;
 
+  // The |thread_id_| on which this object is constructed.
+  const base::PlatformThreadId thread_id_;
+
   DISALLOW_COPY_AND_ASSIGN(ShutdownWatcherHelper);
 };
 
 // DISABLE_RUNNABLE_METHOD_REFCOUNT is a convenience macro for disabling
 // refcounting of ThreadWatcher and ThreadWatcherList classes.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcher);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcherList);
 
 #endif  // CHROME_BROWSER_METRICS_THREAD_WATCHER_H_