| 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 a06ba91041aaa8482ea2a7950fa8e7370aebd0e1..27650e5e6ef4fb06a0c4739a78829202cb54f73f 100644
|
| --- a/base/message_loop/message_loop_unittest.cc
|
| +++ b/base/message_loop/message_loop_unittest.cc
|
| @@ -40,15 +40,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);
|
| }
|
|
|
| @@ -970,7 +970,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());
|
|
|