Index: base/message_loop/message_pump_libevent.cc |
diff --git a/base/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc |
similarity index 97% |
rename from base/message_pump_libevent.cc |
rename to base/message_loop/message_pump_libevent.cc |
index 364f44a5f70eb2119d36174afb3023ae08cf733e..8de0db23e2837df8a92cb4e2020454a635198047 100644 |
--- a/base/message_pump_libevent.cc |
+++ b/base/message_loop/message_pump_libevent.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/message_pump_libevent.h" |
+#include "base/message_loop/message_pump_libevent.h" |
#include <errno.h> |
#include <fcntl.h> |
@@ -11,9 +11,6 @@ |
#include "base/auto_reset.h" |
#include "base/compiler_specific.h" |
#include "base/logging.h" |
-#if defined(OS_MACOSX) |
-#include "base/mac/scoped_nsautorelease_pool.h" |
-#endif |
#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "base/posix/eintr_wrapper.h" |
@@ -221,7 +218,7 @@ static void timer_callback(int fd, short events, void *context) |
// Reentrant! |
void MessagePumpLibevent::Run(Delegate* delegate) { |
DCHECK(keep_running_) << "Quit must have been called outside of Run!"; |
- base::AutoReset<bool> auto_reset_in_run(&in_run_, true); |
+ AutoReset<bool> auto_reset_in_run(&in_run_, true); |
// 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(). |
@@ -343,7 +340,7 @@ bool MessagePumpLibevent::Init() { |
// static |
void MessagePumpLibevent::OnLibeventNotification(int fd, short flags, |
void* context) { |
- base::WeakPtr<FileDescriptorWatcher> controller = |
+ WeakPtr<FileDescriptorWatcher> controller = |
static_cast<FileDescriptorWatcher*>(context)->weak_factory_.GetWeakPtr(); |
DCHECK(controller.get()); |
@@ -363,8 +360,7 @@ void MessagePumpLibevent::OnLibeventNotification(int fd, short flags, |
// Called if a byte is received on the wakeup pipe. |
// static |
void MessagePumpLibevent::OnWakeup(int socket, short flags, void* context) { |
- base::MessagePumpLibevent* that = |
- static_cast<base::MessagePumpLibevent*>(context); |
+ MessagePumpLibevent* that = static_cast<MessagePumpLibevent*>(context); |
DCHECK(that->wakeup_pipe_out_ == socket); |
// Remove and discard the wakeup byte. |