1 files changed, 12 insertions, 36 deletions

diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index 2811fc0..f7765c8 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -8,13 +8,14 @@
 #define CHROME_BROWSER_METRICS_THREAD_WATCHER_H_
 #pragma once
 
+#if 0
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ -22,6 +23,7 @@
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
+#include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
@@ -105,21 +107,21 @@ class ThreadWatcher {
   // OnPongMessage. It also posts a task (OnCheckResponsiveness) to check
   // responsiveness of monitored thread that would be called after waiting
   // unresponsive_time_.
-  // This method is accessible on WatchDogThread.
+  // This method is accessible on WATCHDOG thread.
   virtual void PostPingMessage();
 
   // This method handles a Pong Message from watched thread. It will track the
   // response time (pong time minus ping time) via histograms. It posts a
   // PostPingMessage task that would be called after waiting sleep_time_.  It
   // increments ping_sequence_number_ by 1.
-  // This method is accessible on WatchDogThread.
+  // This method is accessible on WATCHDOG thread.
   virtual void OnPongMessage(uint64 ping_sequence_number);
 
   // This method will determine if the watched thread is responsive or not. If
   // the latest ping_sequence_number_ is not same as the ping_sequence_number
   // that is passed in, then we can assume that watched thread has responded
   // with a pong message.
-  // This method is accessible on WatchDogThread.
+  // This method is accessible on WATCHDOG thread.
   virtual bool OnCheckResponsiveness(uint64 ping_sequence_number);
 
  private:
@@ -201,36 +203,28 @@ class ThreadWatcherList : public NotificationObserver {
   // Register() stores a pointer to the given ThreadWatcher in a global map.
   static void Register(ThreadWatcher* watcher);
 
-  // This method posts a task on WatchDogThread to RevokeAll tasks and to
+  // This method posts a task on WATCHDOG thread to RevokeAll tasks and to
   // deactive thread watching of other threads and tell NotificationService to
   // stop calling Observe.
-  // This method is accessible on UI thread.
   static void StopWatchingAll();
 
   // RemoveAll NotificationTypes that are being observed.
-  // This method is accessible on UI thread.
   static void RemoveNotifications();
 
  private:
   // Allow tests to access our innards for testing purposes.
   FRIEND_TEST(ThreadWatcherTest, Registration);
 
-  // Delete all thread watcher objects and remove them from global map.
-  // This method is accessible on WatchDogThread.
-  void DeleteAll();
-
   // This will ensure that the watching is actively taking place. It will wakeup
   // all thread watchers every 2 seconds. This is the implementation of
   // NotificationObserver. When a matching notification is posted to the
   // notification service, this method is called.
-  // This method is accessible on UI thread.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // This will ensure that the watching is actively taking place, and awaken
   // all thread watchers that are registered.
-  // This method is accessible on WatchDogThread.
   virtual void WakeUpAll();
 
   // The Find() method can be used to test to see if a given ThreadWatcher was
@@ -256,41 +250,23 @@ class ThreadWatcherList : public NotificationObserver {
 };
 
 //------------------------------------------------------------------------------
-// Class for WatchDogThread and in its Init method, we start watching UI, IO,
+// Class for WATCHDOG thread and in its Init method, we start watching UI, IO,
 // DB, FILE, CACHED threads.
-class WatchDogThread : public base::Thread {
+class WatchDogThread : public BrowserProcessSubThread {
  public:
-  // Constructor.
   WatchDogThread();
-
-  // Destroys the thread and stops the thread.
   virtual ~WatchDogThread();
 
-  // Start watching all browser threads.
-  static void StartWatchingAll();
-
-  // Returns current message loop for the watchdog thread. This only returns
-  // non-null after a successful call to Start.  After Stop has been called,
-  // this will return NULL.
-  static MessageLoop* CurrentMessageLoop();
-
-  // Callable on any thread.  Returns whether you're currently on a
-  // watchdog_thread_.
-  static bool CurrentlyOnWatchDogThread();
-
  protected:
   virtual void Init();
-  virtual void CleanUp();
-  virtual void CleanUpAfterMessageLoopDestruction();
-
-  // This lock protects watchdog_thread_.
-  static base::Lock lock_;
-  static WatchDogThread* watchdog_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(WatchDogThread);
 };
 
+
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcher);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ThreadWatcherList);
 
+#endif  // 0
+
 #endif  // CHROME_BROWSER_METRICS_THREAD_WATCHER_H_