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 475 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();
 
  private:
+  friend class ThreadWatcherList;

[jar (doing other things), 2011/11/30 01:02:01]

nit: Why do we need this friend?  Aren't the significant interfaces public?

[ramant (doing other things), 2011/11/30 05:14:53]

Added a static method to disarm the startup timebomb which will disarm (on UI
thread) if the global object exists.

Done.

+
   // Watches for hangs during startup until it is disarm'ed.
-  static base::Watchdog* startup_watchdog_;
+  base::Watchdog* startup_watchdog_;
+
+  // The singleton of this class.
+  static StartupTimeBomb* g_startup_timebomb_;
 
   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();
 
@@ skipping 10 matching lines @@
 
   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_