| Index: ppapi/host/resource_message_filter_unittest.cc
|
| diff --git a/ppapi/host/resource_message_filter_unittest.cc b/ppapi/host/resource_message_filter_unittest.cc
|
| index 59bbc59eeb17bed5119a473d57a2912d09f6dd6e..2cd015ca828b13cc43e1edbdbce6fcacfe5dcba3 100644
|
| --- a/ppapi/host/resource_message_filter_unittest.cc
|
| +++ b/ppapi/host/resource_message_filter_unittest.cc
|
| @@ -4,9 +4,9 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/location.h"
|
| #include "base/run_loop.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| #include "ipc/ipc_message.h"
|
| @@ -99,12 +99,11 @@ class MyResourceFilter : public ResourceMessageFilter {
|
| const base::Thread& bg_thread,
|
| uint32 msg_type,
|
| uint32 reply_msg_type)
|
| - : ResourceMessageFilter(io_thread.message_loop_proxy()),
|
| - message_loop_proxy_(bg_thread.message_loop_proxy()),
|
| + : ResourceMessageFilter(io_thread.task_runner()),
|
| + task_runner_(bg_thread.task_runner()),
|
| msg_type_(msg_type),
|
| reply_msg_type_(reply_msg_type),
|
| - last_message_loop_(NULL) {
|
| - }
|
| + last_message_loop_(NULL) {}
|
|
|
| const IPC::Message& last_handled_msg() const { return last_handled_msg_; }
|
| base::MessageLoop* last_message_loop() const { return last_message_loop_; }
|
| @@ -112,7 +111,7 @@ class MyResourceFilter : public ResourceMessageFilter {
|
| scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
|
| const IPC::Message& msg) override {
|
| if (msg.type() == msg_type_)
|
| - return message_loop_proxy_;
|
| + return task_runner_;
|
| return NULL;
|
| }
|
|
|
| @@ -130,7 +129,7 @@ class MyResourceFilter : public ResourceMessageFilter {
|
| }
|
|
|
| private:
|
| - scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| uint32 msg_type_;
|
| uint32 reply_msg_type_;
|
|
|
| @@ -211,10 +210,9 @@ TEST_F(ResourceMessageFilterTest, TestHandleMessage) {
|
|
|
| // It should be safe to use base::Unretained() because the object won't be
|
| // destroyed before the task is run.
|
| - main_message_loop.PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&ResourceMessageFilterTest::TestHandleMessageImpl,
|
| - base::Unretained(this)));
|
| + main_message_loop.task_runner()->PostTask(
|
| + FROM_HERE, base::Bind(&ResourceMessageFilterTest::TestHandleMessageImpl,
|
| + base::Unretained(this)));
|
|
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|