| Index: webrtc/base/socketserver.h
|
| diff --git a/webrtc/base/socketserver.h b/webrtc/base/socketserver.h
|
| index 5eada4a4061cdefa1dfbeb59d27e4afb3054954d..55b427da7e7ab039bce0ff66e89d3656206d9199 100644
|
| --- a/webrtc/base/socketserver.h
|
| +++ b/webrtc/base/socketserver.h
|
| @@ -11,52 +11,9 @@
|
| #ifndef WEBRTC_BASE_SOCKETSERVER_H_
|
| #define WEBRTC_BASE_SOCKETSERVER_H_
|
|
|
| -#include <memory>
|
| -#include "webrtc/base/socketfactory.h"
|
|
|
| -namespace rtc {
|
| -
|
| -class MessageQueue;
|
| -// Needs to be forward declared because there's a circular dependency between
|
| -// NetworkMonitor and Thread.
|
| -// TODO(deadbeef): Fix this.
|
| -class NetworkBinderInterface;
|
| -
|
| -// Provides the ability to wait for activity on a set of sockets. The Thread
|
| -// class provides a nice wrapper on a socket server.
|
| -//
|
| -// The server is also a socket factory. The sockets it creates will be
|
| -// notified of asynchronous I/O from this server's Wait method.
|
| -class SocketServer : public SocketFactory {
|
| - public:
|
| - static const int kForever = -1;
|
| -
|
| - static std::unique_ptr<SocketServer> CreateDefault();
|
| - // When the socket server is installed into a Thread, this function is
|
| - // called to allow the socket server to use the thread's message queue for
|
| - // any messaging that it might need to perform.
|
| - virtual void SetMessageQueue(MessageQueue* queue) {}
|
| -
|
| - // Sleeps until:
|
| - // 1) cms milliseconds have elapsed (unless cms == kForever)
|
| - // 2) WakeUp() is called
|
| - // While sleeping, I/O is performed if process_io is true.
|
| - virtual bool Wait(int cms, bool process_io) = 0;
|
| -
|
| - // Causes the current wait (if one is in progress) to wake up.
|
| - virtual void WakeUp() = 0;
|
| -
|
| - // A network binder will bind the created sockets to a network.
|
| - // It is only used in PhysicalSocketServer.
|
| - void set_network_binder(NetworkBinderInterface* binder) {
|
| - network_binder_ = binder;
|
| - }
|
| - NetworkBinderInterface* network_binder() const { return network_binder_; }
|
| -
|
| - private:
|
| - NetworkBinderInterface* network_binder_ = nullptr;
|
| -};
|
| -
|
| -} // namespace rtc
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/socketserver.h"
|
|
|
| #endif // WEBRTC_BASE_SOCKETSERVER_H_
|
|
|