| Index: net/dns/serial_worker_unittest.cc
|
| diff --git a/net/dns/serial_worker_unittest.cc b/net/dns/serial_worker_unittest.cc
|
| index 4062c2a2823a4d8949b0a151e2f1083a558593b5..7fe0ef72e3c9226bbe95ae4cde9e7a04c69ede26 100644
|
| --- a/net/dns/serial_worker_unittest.cc
|
| +++ b/net/dns/serial_worker_unittest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "net/dns/serial_worker.h"
|
|
|
| +#include "base/bind.h"
|
| #include "base/message_loop.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/synchronization/waitable_event.h"
|
| @@ -60,23 +61,15 @@ class SerialWorkerTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - friend class BreakTask;
|
| - class BreakTask : public Task {
|
| - public:
|
| - BreakTask(SerialWorkerTest* test, std::string breakpoint)
|
| - : test_(test), breakpoint_(breakpoint) {}
|
| - virtual ~BreakTask() {}
|
| - virtual void Run() OVERRIDE {
|
| - test_->breakpoint_ = breakpoint_;
|
| - MessageLoop::current()->QuitNow();
|
| - }
|
| - private:
|
| - SerialWorkerTest* test_;
|
| - std::string breakpoint_;
|
| - };
|
| + void BreakCallback(std::string breakpoint) {
|
| + breakpoint_ = breakpoint;
|
| + MessageLoop::current()->QuitNow();
|
| + }
|
|
|
| void BreakNow(std::string b) {
|
| - message_loop_->PostTask(FROM_HERE, new BreakTask(this, b));
|
| + message_loop_->PostTask(FROM_HERE,
|
| + base::Bind(&SerialWorkerTest::BreakCallback,
|
| + base::Unretained(this), b));
|
| }
|
|
|
| void RunUntilBreak(std::string b) {
|
|
|