Delete AsyncSocket class, merge into Socket class
Bug: webrtc:13065
Change-Id: I13afee2386ea9c4de0e4fa95133f0c4d3ec826e8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227031
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34787}
diff --git a/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h
index d7ae913..00d2192 100644
--- a/examples/peerconnection/client/peer_connection_client.h
+++ b/examples/peerconnection/client/peer_connection_client.h
@@ -73,8 +73,8 @@
void Close();
void InitSocketSignals();
bool ConnectControlSocket();
- void OnConnect(rtc::AsyncSocket* socket);
- void OnHangingGetConnect(rtc::AsyncSocket* socket);
+ void OnConnect(rtc::Socket* socket);
+ void OnHangingGetConnect(rtc::Socket* socket);
void OnMessageFromPeer(int peer_id, const std::string& message);
// Quick and dirty support for parsing HTTP header values.
@@ -89,13 +89,13 @@
std::string* value);
// Returns true if the whole response has been read.
- bool ReadIntoBuffer(rtc::AsyncSocket* socket,
+ bool ReadIntoBuffer(rtc::Socket* socket,
std::string* data,
size_t* content_length);
- void OnRead(rtc::AsyncSocket* socket);
+ void OnRead(rtc::Socket* socket);
- void OnHangingGetRead(rtc::AsyncSocket* socket);
+ void OnHangingGetRead(rtc::Socket* socket);
// Parses a single line entry in the form "<name>,<id>,<connected>"
bool ParseEntry(const std::string& entry,
@@ -110,15 +110,15 @@
size_t* peer_id,
size_t* eoh);
- void OnClose(rtc::AsyncSocket* socket, int err);
+ void OnClose(rtc::Socket* socket, int err);
void OnResolveResult(rtc::AsyncResolverInterface* resolver);
PeerConnectionClientObserver* callback_;
rtc::SocketAddress server_address_;
rtc::AsyncResolver* resolver_;
- std::unique_ptr<rtc::AsyncSocket> control_socket_;
- std::unique_ptr<rtc::AsyncSocket> hanging_get_;
+ std::unique_ptr<rtc::Socket> control_socket_;
+ std::unique_ptr<rtc::Socket> hanging_get_;
std::string onconnect_data_;
std::string control_data_;
std::string notification_data_;