Revert 255322 "ThreadWatcher: fixes Start/StopWatchingAll."

trunk/src/chrome/browser/metrics/thread_watcher.cc

Index: trunk/src/chrome/browser/metrics/thread_watcher.cc
===================================================================
--- trunk/src/chrome/browser/metrics/thread_watcher.cc	(revision 255400)
+++ trunk/src/chrome/browser/metrics/thread_watcher.cc	(working copy)
@@ -409,8 +409,6 @@
 // static
 ThreadWatcherList* ThreadWatcherList::g_thread_watcher_list_ = NULL;
 // static
-bool ThreadWatcherList::g_stopped_ = false;
-// static
 const int ThreadWatcherList::kSleepSeconds = 1;
 // static
 const int ThreadWatcherList::kUnresponsiveSeconds = 2;
@@ -445,10 +443,6 @@
   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,
@@ -641,12 +635,6 @@
     const CrashOnHangThreadMap& crash_on_hang_threads) {
   DCHECK(WatchDogThread::CurrentlyOnWatchDogThread());
 
-  // This method is deferred in relationship to its StopWatchingAll()
-  // counterpart. If a previous initialization has already happened, or if
-  // stop has been called, there's nothing left to do here.
-  if (g_thread_watcher_list_ || g_stopped_)
-    return;
-
   ThreadWatcherList* thread_watcher_list = new ThreadWatcherList();
   CHECK(thread_watcher_list);
 
@@ -712,9 +700,6 @@
   }
 
   DCHECK(WatchDogThread::CurrentlyOnWatchDogThread());
-
-  SetStopped(true);
-
   if (!g_thread_watcher_list_)
     return;
 
@@ -740,12 +725,6 @@
   return it->second;
 }
 
-// static
-void ThreadWatcherList::SetStopped(bool stopped) {
-  DCHECK(WatchDogThread::CurrentlyOnWatchDogThread());
-  g_stopped_ = stopped;
-}
-
 // ThreadWatcherObserver methods and members.
 //
 // static