| Index: base/async_socket_io_handler.h
|
| diff --git a/base/async_socket_io_handler.h b/base/async_socket_io_handler.h
|
| index a22c29d907df6feb8e0bb12c4a27b105e47b4ecd..79def118f87ff038bb42262e84b02c48b49c3e50 100644
|
| --- a/base/async_socket_io_handler.h
|
| +++ b/base/async_socket_io_handler.h
|
| @@ -46,12 +46,7 @@ namespace base {
|
| //
|
| class BASE_EXPORT AsyncSocketIoHandler
|
| : public NON_EXPORTED_BASE(base::NonThreadSafe),
|
| -// The message loop callback interface is different based on platforms.
|
| -#if defined(OS_WIN)
|
| - public NON_EXPORTED_BASE(base::MessageLoopForIO::IOHandler) {
|
| -#else
|
| public NON_EXPORTED_BASE(base::MessageLoopForIO::Watcher) {
|
| -#endif
|
| public:
|
| AsyncSocketIoHandler();
|
| ~AsyncSocketIoHandler() override;
|
| @@ -74,13 +69,8 @@ class BASE_EXPORT AsyncSocketIoHandler
|
| bool Read(char* buffer, int buffer_len);
|
|
|
| private:
|
| -#if defined(OS_WIN)
|
| - // Implementation of IOHandler on Windows.
|
| - void OnIOCompleted(base::MessageLoopForIO::IOContext* context,
|
| - DWORD bytes_transfered,
|
| - DWORD error) override;
|
| -#elif defined(OS_POSIX)
|
| // Implementation of base::MessageLoopForIO::Watcher.
|
| +#if defined(OS_POSIX)
|
| void OnFileCanWriteWithoutBlocking(int socket) override {}
|
| void OnFileCanReadWithoutBlocking(int socket) override;
|
|
|
| @@ -88,10 +78,7 @@ class BASE_EXPORT AsyncSocketIoHandler
|
| #endif
|
|
|
| base::SyncSocket::Handle socket_;
|
| -#if defined(OS_WIN)
|
| - base::MessageLoopForIO::IOContext* context_;
|
| - bool is_pending_;
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| base::MessageLoopForIO::FileDescriptorWatcher socket_watcher_;
|
| // |pending_buffer_| and |pending_buffer_len_| are valid only between
|
| // Read() and OnFileCanReadWithoutBlocking().
|
|
|