Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.

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 444 matching lines @@
 // DB, FILE, CACHED threads.
 class WatchDogThread : public base::Thread {
  public:
   // Constructor.
   WatchDogThread();
 
   // Destroys the thread and stops the thread.
   virtual ~WatchDogThread();
 
   // Callable on any thread.  Returns whether you're currently on a
-  // WatchDogThread.
+  // watchdog_thread_.
   static bool CurrentlyOnWatchDogThread();
 
   // These are the same methods in message_loop.h, but are guaranteed to either
   // get posted to the MessageLoop if it's still alive, or be deleted otherwise.
   // They return true iff the watchdog thread existed and the task was posted.
   // Note that even if the task is posted, there's no guarantee that it will
   // run, since the target thread may already have a Quit message in its queue.
   static bool PostTask(const tracked_objects::Location& from_here,
                        const base::Closure& task);
   static bool PostDelayedTask(const tracked_objects::Location& from_here,
                               const base::Closure& task,
                               int64 delay_ms);
 
  protected:
   virtual void Init();
   virtual void CleanUp();
 
  private:
   static bool PostTaskHelper(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
       int64 delay_ms);
 
+  // This lock protects watchdog_thread_.
+  static base::Lock lock_;
+
+  static WatchDogThread* watchdog_thread_;  // The singleton of this class.
+
   DISALLOW_COPY_AND_ASSIGN(WatchDogThread);
 };
 
 // This is a wrapper class for getting the crash dumps of the hangs during
 // startup.
 class StartupTimeBomb {
  public:
   // Constructs |startup_watchdog_| which spawns a thread and starts timer.
   // |duration| specifies how long |startup_watchdog_| will wait before it
   // calls alarm.
@@ skipping 29 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_