summaryrefslogtreecommitdiffstats
path: root/base/message_loop.cc
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 00:23:24 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 00:23:24 +0000
commit35aa85ac00fbfa16bd9f52b05e47eb09a3b6a0ce (patch)
tree1f42710b6f0e4250bca214f340ab752491f6d20a /base/message_loop.cc
parentdab8619b4848bb10dfe78a3f0c59d6e661ec9610 (diff)
downloadchromium_src-35aa85ac00fbfa16bd9f52b05e47eb09a3b6a0ce.zip
chromium_src-35aa85ac00fbfa16bd9f52b05e47eb09a3b6a0ce.tar.gz
chromium_src-35aa85ac00fbfa16bd9f52b05e47eb09a3b6a0ce.tar.bz2
Revert "Make tcp_client_socket_unittest pass on Linux."
This reverts commit d63170654d935f5a8ff6517bfacb60893f186a6b. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
-rw-r--r--base/message_loop.cc22
1 files changed, 1 insertions, 21 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 48e05eb..4b95532 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -13,10 +13,6 @@
#include "base/string_util.h"
#include "base/thread_local.h"
-#if defined(OS_POSIX)
-#include "base/message_pump_libevent.h"
-#endif
-
// A lazily created thread local storage for quick access to a thread's message
// loop, if one exists. This should be safe and free of static constructors.
static base::LazyInstance<base::ThreadLocalPointer<MessageLoop> > lazy_tls_ptr(
@@ -82,12 +78,6 @@ MessageLoop::MessageLoop(Type type)
} else {
pump_ = new base::MessagePumpWin();
}
-#elif defined(OS_POSIX)
- if (type_ == TYPE_IO) {
- pump_ = new base::MessagePumpLibevent();
- } else {
- pump_ = new base::MessagePumpDefault();
- }
#else
pump_ = new base::MessagePumpDefault();
#endif
@@ -571,14 +561,4 @@ void MessageLoopForIO::WatchObject(HANDLE object, Watcher* watcher) {
pump_win()->WatchObject(object, watcher);
}
-#elif defined(OS_POSIX)
-
-void MessageLoopForIO::WatchSocket(int socket, short interest_mask,
- struct event* e, Watcher* watcher) {
- pump_libevent()->WatchSocket(socket, interest_mask, e, watcher);
-}
-
-void MessageLoopForIO::UnwatchSocket(struct event* e) {
- pump_libevent()->UnwatchSocket(e);
-}
-#endif
+#endif // defined(OS_WIN)