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

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/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
-#include "base/lazy_instance.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 "chrome/common/logging_chrome.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ skipping 673 matching lines @@
   base::TimeTicks now = base::TimeTicks::Now();
   if ((now - last_wakeup_time_) < wakeup_interval_)
     return;
   last_wakeup_time_ = now;
   WatchDogThread::PostTask(
       FROM_HERE,
       base::Bind(&ThreadWatcherList::WakeUpAll));
 }
 
 // WatchDogThread methods and members.
-
-// This lock protects g_watchdog_thread.
-static base::LazyInstance<base::Lock,
-                          base::LeakyLazyInstanceTraits<base::Lock> >
-    g_watchdog_lock = LAZY_INSTANCE_INITIALIZER;
-
-// The singleton of this class.
-static WatchDogThread* g_watchdog_thread = NULL;
-
+//
+// static
+base::Lock WatchDogThread::lock_;
+// static
+WatchDogThread* WatchDogThread::watchdog_thread_ = NULL;
 
 // The WatchDogThread object must outlive any tasks posted to the IO thread
 // before the Quit task.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(WatchDogThread);
 
 WatchDogThread::WatchDogThread() : Thread("BrowserWatchdog") {
 }
 
 WatchDogThread::~WatchDogThread() {
   Stop();
 }
 
 // static
 bool WatchDogThread::CurrentlyOnWatchDogThread() {
-  base::AutoLock lock(g_watchdog_lock.Get());
-  return g_watchdog_thread &&
-    g_watchdog_thread->message_loop() == MessageLoop::current();
+  base::AutoLock lock(lock_);
+  return watchdog_thread_ &&
+    watchdog_thread_->message_loop() == MessageLoop::current();
 }
 
 // static
 bool WatchDogThread::PostTask(const tracked_objects::Location& from_here,
                               const base::Closure& task) {
   return PostTaskHelper(from_here, task, 0);
 }
 
 // static
 bool WatchDogThread::PostDelayedTask(const tracked_objects::Location& from_here,
                                      const base::Closure& task,
                                      int64 delay_ms) {
   return PostTaskHelper(from_here, task, delay_ms);
 }
 
 // static
 bool WatchDogThread::PostTaskHelper(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     int64 delay_ms) {
   {
-    base::AutoLock lock(g_watchdog_lock.Get());
+    base::AutoLock lock(lock_);
 
-    MessageLoop* message_loop = g_watchdog_thread ?
-        g_watchdog_thread->message_loop() : NULL;
+    MessageLoop* message_loop = watchdog_thread_ ?
+        watchdog_thread_->message_loop() : NULL;
     if (message_loop) {
       message_loop->PostDelayedTask(from_here, task, delay_ms);
       return true;
     }
   }
 
   return false;
 }
 
 void WatchDogThread::Init() {
   // This thread shouldn't be allowed to perform any blocking disk I/O.
   base::ThreadRestrictions::SetIOAllowed(false);
 
-  base::AutoLock lock(g_watchdog_lock.Get());
-  CHECK(!g_watchdog_thread);
-  g_watchdog_thread = this;
+  base::AutoLock lock(lock_);
+  CHECK(!watchdog_thread_);
+  watchdog_thread_ = this;
 }
 
 void WatchDogThread::CleanUp() {
-  base::AutoLock lock(g_watchdog_lock.Get());
-  g_watchdog_thread = NULL;
+  base::AutoLock lock(lock_);
+  watchdog_thread_ = NULL;
 }
 
 namespace {
 
 // StartupWatchDogThread methods and members.
 //
 // Class for detecting hangs during startup.
 class StartupWatchDogThread : public base::Watchdog {
  public:
   // Constructor specifies how long the StartupWatchDogThread will wait before
@@ skipping 92 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();
 }