| Index: base/message_loop/message_pump_libevent.cc
|
| diff --git a/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc
|
| index c0a02b2b4920fd965f53fde7b2ff36c3378972b9..d59a234be37c6d1e5da211cb8d59f1532279be9e 100644
|
| --- a/base/message_loop/message_pump_libevent.cc
|
| +++ b/base/message_loop/message_pump_libevent.cc
|
| @@ -7,11 +7,12 @@
|
| #include <errno.h>
|
| #include <unistd.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/auto_reset.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_util.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/posix/eintr_wrapper.h"
|
| #include "base/third_party/libevent/event.h"
|
| @@ -153,7 +154,7 @@ bool MessagePumpLibevent::WatchFileDescriptor(int fd,
|
| event_mask |= EV_WRITE;
|
| }
|
|
|
| - scoped_ptr<event> evt(controller->ReleaseEvent());
|
| + std::unique_ptr<event> evt(controller->ReleaseEvent());
|
| if (evt.get() == NULL) {
|
| // Ownership is transferred to the controller.
|
| evt.reset(new event);
|
| @@ -219,7 +220,7 @@ void MessagePumpLibevent::Run(Delegate* delegate) {
|
|
|
| // event_base_loopexit() + EVLOOP_ONCE is leaky, see http://crbug.com/25641.
|
| // Instead, make our own timer and reuse it on each call to event_base_loop().
|
| - scoped_ptr<event> timer_event(new event);
|
| + std::unique_ptr<event> timer_event(new event);
|
|
|
| for (;;) {
|
| #if defined(OS_MACOSX)
|
|
|