Index: base/message_loop/message_loop.cc |
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc |
index 04aa9a8f0e8c4e7bdcf1fc93a0c7bb99a154bafe..01e7512b19f09ce6d611c6b2db18161e55437dbf 100644 |
--- a/base/message_loop/message_loop.cc |
+++ b/base/message_loop/message_loop.cc |
@@ -5,13 +5,14 @@ |
#include "base/message_loop/message_loop.h" |
#include <algorithm> |
+#include <memory> |
#include <utility> |
#include "base/bind.h" |
#include "base/compiler_specific.h" |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_pump_default.h" |
#include "base/metrics/histogram.h" |
#include "base/metrics/statistics_recorder.h" |
@@ -103,7 +104,7 @@ MessagePumpForIO* ToPumpIO(MessagePump* pump) { |
} |
#endif // !defined(OS_NACL_SFI) |
-scoped_ptr<MessagePump> ReturnPump(scoped_ptr<MessagePump> pump) { |
+std::unique_ptr<MessagePump> ReturnPump(std::unique_ptr<MessagePump> pump) { |
return pump; |
} |
@@ -127,7 +128,7 @@ MessageLoop::MessageLoop(Type type) |
BindToCurrentThread(); |
} |
-MessageLoop::MessageLoop(scoped_ptr<MessagePump> pump) |
+MessageLoop::MessageLoop(std::unique_ptr<MessagePump> pump) |
: MessageLoop(TYPE_CUSTOM, Bind(&ReturnPump, Passed(&pump))) { |
BindToCurrentThread(); |
} |
@@ -206,7 +207,7 @@ bool MessageLoop::InitMessagePumpForUIFactory(MessagePumpFactory* factory) { |
} |
// static |
-scoped_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { |
+std::unique_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { |
// TODO(rvargas): Get rid of the OS guards. |
#if defined(USE_GLIB) && !defined(OS_NACL) |
typedef MessagePumpGlib MessagePumpForUI; |
@@ -215,21 +216,22 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { |
#endif |
#if defined(OS_IOS) || defined(OS_MACOSX) |
-#define MESSAGE_PUMP_UI scoped_ptr<MessagePump>(MessagePumpMac::Create()) |
+#define MESSAGE_PUMP_UI std::unique_ptr<MessagePump>(MessagePumpMac::Create()) |
#elif defined(OS_NACL) |
// Currently NaCl doesn't have a UI MessageLoop. |
// TODO(abarth): Figure out if we need this. |
-#define MESSAGE_PUMP_UI scoped_ptr<MessagePump>() |
+#define MESSAGE_PUMP_UI std::unique_ptr<MessagePump>() |
#else |
-#define MESSAGE_PUMP_UI scoped_ptr<MessagePump>(new MessagePumpForUI()) |
+#define MESSAGE_PUMP_UI std::unique_ptr<MessagePump>(new MessagePumpForUI()) |
#endif |
#if defined(OS_MACOSX) |
// Use an OS native runloop on Mac to support timer coalescing. |
- #define MESSAGE_PUMP_DEFAULT \ |
- scoped_ptr<MessagePump>(new MessagePumpCFRunLoop()) |
+#define MESSAGE_PUMP_DEFAULT \ |
+ std::unique_ptr<MessagePump>(new MessagePumpCFRunLoop()) |
#else |
- #define MESSAGE_PUMP_DEFAULT scoped_ptr<MessagePump>(new MessagePumpDefault()) |
+#define MESSAGE_PUMP_DEFAULT \ |
+ std::unique_ptr<MessagePump>(new MessagePumpDefault()) |
#endif |
if (type == MessageLoop::TYPE_UI) { |
@@ -238,11 +240,11 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { |
return MESSAGE_PUMP_UI; |
} |
if (type == MessageLoop::TYPE_IO) |
- return scoped_ptr<MessagePump>(new MessagePumpForIO()); |
+ return std::unique_ptr<MessagePump>(new MessagePumpForIO()); |
#if defined(OS_ANDROID) |
if (type == MessageLoop::TYPE_JAVA) |
- return scoped_ptr<MessagePump>(new MessagePumpForUI()); |
+ return std::unique_ptr<MessagePump>(new MessagePumpForUI()); |
#endif |
DCHECK_EQ(MessageLoop::TYPE_DEFAULT, type); |
@@ -375,9 +377,10 @@ bool MessageLoop::IsIdleForTesting() { |
//------------------------------------------------------------------------------ |
// static |
-scoped_ptr<MessageLoop> MessageLoop::CreateUnbound( |
- Type type, MessagePumpFactoryCallback pump_factory) { |
- return make_scoped_ptr(new MessageLoop(type, pump_factory)); |
+std::unique_ptr<MessageLoop> MessageLoop::CreateUnbound( |
+ Type type, |
+ MessagePumpFactoryCallback pump_factory) { |
+ return WrapUnique(new MessageLoop(type, pump_factory)); |
} |
MessageLoop::MessageLoop(Type type, MessagePumpFactoryCallback pump_factory) |
@@ -674,9 +677,8 @@ void MessageLoop::ReleaseSoonInternal( |
//------------------------------------------------------------------------------ |
// MessageLoopForUI |
-MessageLoopForUI::MessageLoopForUI(scoped_ptr<MessagePump> pump) |
- : MessageLoop(TYPE_UI, Bind(&ReturnPump, Passed(&pump))) { |
-} |
+MessageLoopForUI::MessageLoopForUI(std::unique_ptr<MessagePump> pump) |
+ : MessageLoop(TYPE_UI, Bind(&ReturnPump, Passed(&pump))) {} |
#if defined(OS_ANDROID) |
void MessageLoopForUI::Start() { |