| Index: base/threading/thread_perftest.cc
|
| diff --git a/base/threading/thread_perftest.cc b/base/threading/thread_perftest.cc
|
| index 3bc9fb409ce7b3e4bbc42992f4cd5d0d732aceed..a08cc5bf87274ee1ab950d169313720d19a594e7 100644
|
| --- a/base/threading/thread_perftest.cc
|
| +++ b/base/threading/thread_perftest.cc
|
| @@ -5,9 +5,7 @@
|
| #include "base/base_switches.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| -#include "base/location.h"
|
| #include "base/memory/scoped_vector.h"
|
| -#include "base/single_thread_task_runner.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/synchronization/condition_variable.h"
|
| #include "base/synchronization/lock.h"
|
| @@ -56,9 +54,12 @@
|
| base::TimeTicks ThreadNow(base::Thread* thread) {
|
| base::WaitableEvent done(false, false);
|
| base::TimeTicks ticks;
|
| - thread->task_runner()->PostTask(
|
| - FROM_HERE, base::Bind(&ThreadPerfTest::TimeOnThread,
|
| - base::Unretained(this), &ticks, &done));
|
| + thread->message_loop_proxy()->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&ThreadPerfTest::TimeOnThread,
|
| + base::Unretained(this),
|
| + &ticks,
|
| + &done));
|
| done.Wait();
|
| return ticks;
|
| }
|
| @@ -127,9 +128,10 @@
|
| FinishMeasurement();
|
| return;
|
| }
|
| - NextThread(hops)->task_runner()->PostTask(
|
| - FROM_HERE, base::Bind(&ThreadPerfTest::PingPong, base::Unretained(this),
|
| - hops - 1));
|
| + NextThread(hops)->message_loop_proxy()->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(
|
| + &ThreadPerfTest::PingPong, base::Unretained(this), hops - 1));
|
| }
|
| };
|
|
|
| @@ -196,9 +198,11 @@
|
| void PingPong(int hops) override {
|
| remaining_hops_ = hops;
|
| for (size_t i = 0; i < threads_.size(); i++) {
|
| - threads_[i]->task_runner()->PostTask(
|
| - FROM_HERE, base::Bind(&EventPerfTest::WaitAndSignalOnThread,
|
| - base::Unretained(this), i));
|
| + threads_[i]->message_loop_proxy()->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&EventPerfTest::WaitAndSignalOnThread,
|
| + base::Unretained(this),
|
| + i));
|
| }
|
|
|
| // Kick off the Signal ping-ponging.
|
|
|