| Index: chrome/browser/metrics/thread_watcher.cc
|
| diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
|
| index 57531be804979a9fb52bf575faabbff6a7fedb83..62e71162456d41b332e9d1cec097674d5ea906ed 100644
|
| --- a/chrome/browser/metrics/thread_watcher.cc
|
| +++ b/chrome/browser/metrics/thread_watcher.cc
|
| @@ -184,7 +184,7 @@ void ThreadWatcher::ActivateThreadWatching() {
|
| active_ = true;
|
| ping_count_ = unresponsive_threshold_;
|
| ResetHangCounters();
|
| - MessageLoop::current()->PostTask(
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&ThreadWatcher::PostPingMessage,
|
| weak_ptr_factory_.GetWeakPtr()));
|
| @@ -240,11 +240,12 @@ void ThreadWatcher::PostPingMessage() {
|
| base::Bind(&ThreadWatcher::OnPingMessage, thread_id_,
|
| callback))) {
|
| // Post a task to check the responsiveness of watched thread.
|
| - MessageLoop::current()->PostDelayedTask(
|
| - FROM_HERE,
|
| - base::Bind(&ThreadWatcher::OnCheckResponsiveness,
|
| - weak_ptr_factory_.GetWeakPtr(), ping_sequence_number_),
|
| - unresponsive_time_);
|
| + base::MessageLoop::current()->PostDelayedTask(
|
| + FROM_HERE,
|
| + base::Bind(&ThreadWatcher::OnCheckResponsiveness,
|
| + weak_ptr_factory_.GetWeakPtr(),
|
| + ping_sequence_number_),
|
| + unresponsive_time_);
|
| } else {
|
| // Watched thread might have gone away, stop watching it.
|
| DeActivateThreadWatching();
|
| @@ -276,7 +277,7 @@ void ThreadWatcher::OnPongMessage(uint64 ping_sequence_number) {
|
| if (!active_ || --ping_count_ <= 0)
|
| return;
|
|
|
| - MessageLoop::current()->PostDelayedTask(
|
| + base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::Bind(&ThreadWatcher::PostPingMessage,
|
| weak_ptr_factory_.GetWeakPtr()),
|
| @@ -305,10 +306,11 @@ void ThreadWatcher::OnCheckResponsiveness(uint64 ping_sequence_number) {
|
| GotNoResponse();
|
|
|
| // Post a task to check the responsiveness of watched thread.
|
| - MessageLoop::current()->PostDelayedTask(
|
| + base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::Bind(&ThreadWatcher::OnCheckResponsiveness,
|
| - weak_ptr_factory_.GetWeakPtr(), ping_sequence_number_),
|
| + weak_ptr_factory_.GetWeakPtr(),
|
| + ping_sequence_number_),
|
| unresponsive_time_);
|
| responsive_ = false;
|
| }
|
| @@ -787,7 +789,7 @@ WatchDogThread::~WatchDogThread() {
|
| bool WatchDogThread::CurrentlyOnWatchDogThread() {
|
| base::AutoLock lock(g_watchdog_lock.Get());
|
| return g_watchdog_thread &&
|
| - g_watchdog_thread->message_loop() == MessageLoop::current();
|
| + g_watchdog_thread->message_loop() == base::MessageLoop::current();
|
| }
|
|
|
| // static
|
| @@ -811,8 +813,8 @@ bool WatchDogThread::PostTaskHelper(
|
| {
|
| base::AutoLock lock(g_watchdog_lock.Get());
|
|
|
| - MessageLoop* message_loop = g_watchdog_thread ?
|
| - g_watchdog_thread->message_loop() : NULL;
|
| + base::MessageLoop* message_loop =
|
| + g_watchdog_thread ? g_watchdog_thread->message_loop() : NULL;
|
| if (message_loop) {
|
| message_loop->PostDelayedTask(from_here, task, delay);
|
| return true;
|
| @@ -933,7 +935,7 @@ void StartupTimeBomb::DeleteStartupWatchdog() {
|
| startup_watchdog_ = NULL;
|
| return;
|
| }
|
| - MessageLoop::current()->PostDelayedTask(
|
| + base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::Bind(&StartupTimeBomb::DeleteStartupWatchdog,
|
| base::Unretained(this)),
|
|
|