| Index: chrome/browser/metrics/thread_watcher.h
|
| diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
|
| index a36cbac5c14421556917e1f1e07ce1e3454b009f..64d9058ebb82da6a1ac60eb51df27627fe6cfa6c 100644
|
| --- a/chrome/browser/metrics/thread_watcher.h
|
| +++ b/chrome/browser/metrics/thread_watcher.h
|
| @@ -462,7 +462,7 @@ class WatchDogThread : public base::Thread {
|
| virtual ~WatchDogThread();
|
|
|
| // Callable on any thread. Returns whether you're currently on a
|
| - // watchdog_thread_.
|
| + // WatchDogThread.
|
| static bool CurrentlyOnWatchDogThread();
|
|
|
| // These are the same methods in message_loop.h, but are guaranteed to either
|
| @@ -486,11 +486,6 @@ class WatchDogThread : public base::Thread {
|
| 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);
|
| };
|
|
|
|
|