| Index: chrome/browser/metrics/thread_watcher.cc
|
| diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
|
| index bd5d498de9602c2d429bd25f4b753a491a4db3aa..41091053390a35c1d1bb568d9b1c1f54027a1a2c 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,7 +240,7 @@ void ThreadWatcher::PostPingMessage() {
|
| base::Bind(&ThreadWatcher::OnPingMessage, thread_id_,
|
| callback))) {
|
| // 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_),
|
| @@ -276,7 +276,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,7 +305,7 @@ 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_),
|
| @@ -787,7 +787,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,7 +811,7 @@ bool WatchDogThread::PostTaskHelper(
|
| {
|
| base::AutoLock lock(g_watchdog_lock.Get());
|
|
|
| - MessageLoop* message_loop = g_watchdog_thread ?
|
| + base::MessageLoop* message_loop = g_watchdog_thread ?
|
| g_watchdog_thread->message_loop() : NULL;
|
| if (message_loop) {
|
| message_loop->PostDelayedTask(from_here, task, delay);
|
| @@ -933,7 +933,7 @@ void StartupTimeBomb::DeleteStartupWatchdog() {
|
| startup_watchdog_ = NULL;
|
| return;
|
| }
|
| - MessageLoop::current()->PostDelayedTask(
|
| + base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::Bind(&StartupTimeBomb::DeleteStartupWatchdog,
|
| base::Unretained(this)),
|
|
|