| Index: base/message_loop/message_loop_unittest.cc
|
| diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc
|
| index 7b31214d99fb1a4b7402b68ac38d17e582788009..e0e46e2202456c0b39725e59811d8cdc08eeed31 100644
|
| --- a/base/message_loop/message_loop_unittest.cc
|
| +++ b/base/message_loop/message_loop_unittest.cc
|
| @@ -41,15 +41,15 @@ namespace base {
|
|
|
| namespace {
|
|
|
| -scoped_ptr<MessagePump> TypeDefaultMessagePumpFactory() {
|
| +std::unique_ptr<MessagePump> TypeDefaultMessagePumpFactory() {
|
| return MessageLoop::CreateMessagePumpForType(MessageLoop::TYPE_DEFAULT);
|
| }
|
|
|
| -scoped_ptr<MessagePump> TypeIOMessagePumpFactory() {
|
| +std::unique_ptr<MessagePump> TypeIOMessagePumpFactory() {
|
| return MessageLoop::CreateMessagePumpForType(MessageLoop::TYPE_IO);
|
| }
|
|
|
| -scoped_ptr<MessagePump> TypeUIMessagePumpFactory() {
|
| +std::unique_ptr<MessagePump> TypeUIMessagePumpFactory() {
|
| return MessageLoop::CreateMessagePumpForType(MessageLoop::TYPE_UI);
|
| }
|
|
|
| @@ -971,7 +971,7 @@ TEST(MessageLoopTest, DeleteUnboundLoop) {
|
| // It should be possible to delete an unbound message loop on a thread which
|
| // already has another active loop. This happens when thread creation fails.
|
| MessageLoop loop;
|
| - scoped_ptr<MessageLoop> unbound_loop(MessageLoop::CreateUnbound(
|
| + std::unique_ptr<MessageLoop> unbound_loop(MessageLoop::CreateUnbound(
|
| MessageLoop::TYPE_DEFAULT, MessageLoop::MessagePumpFactoryCallback()));
|
| unbound_loop.reset();
|
| EXPECT_EQ(&loop, MessageLoop::current());
|
|
|