diff options
| -rw-r--r-- | base/message_loop_unittest.cc | 9 | ||||
| -rw-r--r-- | base/message_pump_libevent_unittest.cc | 2 | ||||
| -rw-r--r-- | net/base/listen_socket.cc | 5 | ||||
| -rw-r--r-- | net/base/listen_socket.h | 1 | ||||
| -rw-r--r-- | net/net.gyp | 3 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_libevent.cc | 5 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_libevent.h | 2 | ||||
| -rw-r--r-- | net/socket/tcp_server_socket_libevent.cc | 5 | ||||
| -rw-r--r-- | net/udp/udp_socket_libevent.cc | 5 |
9 files changed, 4 insertions, 33 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc index 646619d..092f58a 100644 --- a/base/message_loop_unittest.cc +++ b/base/message_loop_unittest.cc @@ -20,9 +20,6 @@ #include "base/message_pump_win.h" #include "base/win/scoped_handle.h" #endif -#if defined(OS_POSIX) -#include "base/message_pump_libevent.h" -#endif using base::PlatformThread; using base::Thread; @@ -1560,7 +1557,7 @@ TEST(MessageLoopTest, HighResolutionTimer) { namespace { -class QuitDelegate : public base::MessagePumpLibevent::Watcher { +class QuitDelegate : public MessageLoopForIO::Watcher { public: virtual void OnFileCanWriteWithoutBlocking(int fd) { MessageLoop::current()->Quit(); @@ -1583,7 +1580,7 @@ TEST(MessageLoopTest, FileDescriptorWatcherOutlivesMessageLoop) { int fd = pipefds[1]; { // Arrange for controller to live longer than message loop. - base::MessagePumpLibevent::FileDescriptorWatcher controller; + MessageLoopForIO::FileDescriptorWatcher controller; { MessageLoopForIO message_loop; @@ -1610,7 +1607,7 @@ TEST(MessageLoopTest, FileDescriptorWatcherDoubleStop) { // Arrange for message loop to live longer than controller. MessageLoopForIO message_loop; { - base::MessagePumpLibevent::FileDescriptorWatcher controller; + MessageLoopForIO::FileDescriptorWatcher controller; QuitDelegate delegate; message_loop.WatchFileDescriptor(fd, diff --git a/base/message_pump_libevent_unittest.cc b/base/message_pump_libevent_unittest.cc index 2d7e1fd..7c6f397 100644 --- a/base/message_pump_libevent_unittest.cc +++ b/base/message_pump_libevent_unittest.cc @@ -42,7 +42,7 @@ class StupidWatcher : public base::MessagePumpLibevent::Watcher { public: virtual ~StupidWatcher() {} - // base:MessagePumpLibEvent::Watcher interface + // base:MessagePumpLibevent::Watcher interface virtual void OnFileCanReadWithoutBlocking(int fd) {} virtual void OnFileCanWriteWithoutBlocking(int fd) {} }; diff --git a/net/base/listen_socket.cc b/net/base/listen_socket.cc index c97b2c6..0971784 100644 --- a/net/base/listen_socket.cc +++ b/net/base/listen_socket.cc @@ -14,11 +14,6 @@ #include <sys/socket.h> #include <arpa/inet.h> #include "net/base/net_errors.h" -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif #endif #include "base/eintr_wrapper.h" diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h index 8136667..6a276b2 100644 --- a/net/base/listen_socket.h +++ b/net/base/listen_socket.h @@ -30,7 +30,6 @@ #include "net/base/net_api.h" #if defined(OS_POSIX) -struct event; // From libevent typedef int SOCKET; #endif diff --git a/net/net.gyp b/net/net.gyp index 714eacc..95ebf9c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -794,9 +794,6 @@ ], }, { # else: OS != "win" - 'dependencies': [ - '../third_party/libevent/libevent.gyp:libevent', - ], 'sources!': [ 'base/winsock_init.cc', 'base/winsock_init.h', diff --git a/net/socket/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc index 2e4c97d..8540342 100644 --- a/net/socket/tcp_client_socket_libevent.cc +++ b/net/socket/tcp_client_socket_libevent.cc @@ -26,11 +26,6 @@ #include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif namespace net { diff --git a/net/socket/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h index b9bc557..607b9ee 100644 --- a/net/socket/tcp_client_socket_libevent.h +++ b/net/socket/tcp_client_socket_libevent.h @@ -15,8 +15,6 @@ #include "net/base/net_log.h" #include "net/socket/stream_socket.h" -struct event; // From libevent - namespace net { class BoundNetLog; diff --git a/net/socket/tcp_server_socket_libevent.cc b/net/socket/tcp_server_socket_libevent.cc index 89119f6..02c448a 100644 --- a/net/socket/tcp_server_socket_libevent.cc +++ b/net/socket/tcp_server_socket_libevent.cc @@ -14,11 +14,6 @@ #if defined(OS_POSIX) #include <netinet/in.h> #endif -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif #include "base/eintr_wrapper.h" #include "net/base/ip_endpoint.h" diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc index b3e208e..c451696 100644 --- a/net/udp/udp_socket_libevent.cc +++ b/net/udp/udp_socket_libevent.cc @@ -21,11 +21,6 @@ #if defined(OS_POSIX) #include <netinet/in.h> #endif -#if defined(USE_SYSTEM_LIBEVENT) -#include <event.h> -#else -#include "third_party/libevent/event.h" -#endif namespace net { |