Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: net/socket/socket_test_util.cc

Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/socket_test_util.h ('k') | net/websockets/websocket_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index a14ab2a5d2cd58f9432faa312bf1e522253d3c05..dbc59d7c484591593169fa00b49587d8cfc2f852 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -877,7 +877,10 @@ int MockTCPClientSocket::Connect(const CompletionCallback& callback) {
connected_ = true;
peer_closed_connection_ = false;
if (data_->connect_data().mode == ASYNC) {
- RunCallbackAsync(callback, data_->connect_data().result);
+ if (data_->connect_data().result == ERR_IO_PENDING)
+ pending_callback_ = callback;
+ else
+ RunCallbackAsync(callback, data_->connect_data().result);
return ERR_IO_PENDING;
}
return data_->connect_data().result;
@@ -940,6 +943,11 @@ void MockTCPClientSocket::OnReadComplete(const MockRead& data) {
RunCallback(callback, rv);
}
+void MockTCPClientSocket::OnConnectComplete(const MockConnect& data) {
+ CompletionCallback callback = pending_callback_;
+ RunCallback(callback, data.result);
+}
+
int MockTCPClientSocket::CompleteRead() {
DCHECK(pending_buf_);
DCHECK(pending_buf_len_ > 0);
@@ -1171,6 +1179,10 @@ const BoundNetLog& DeterministicMockUDPClientSocket::NetLog() const {
void DeterministicMockUDPClientSocket::OnReadComplete(const MockRead& data) {}
+void DeterministicMockUDPClientSocket::OnConnectComplete(
+ const MockConnect& data) {
+ NOTIMPLEMENTED();
+}
DeterministicMockTCPClientSocket::DeterministicMockTCPClientSocket(
net::NetLog* net_log,
@@ -1261,6 +1273,9 @@ bool DeterministicMockTCPClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
void DeterministicMockTCPClientSocket::OnReadComplete(const MockRead& data) {}
+void DeterministicMockTCPClientSocket::OnConnectComplete(
+ const MockConnect& data) {}
+
// static
void MockSSLClientSocket::ConnectCallback(
MockSSLClientSocket *ssl_client_socket,
@@ -1407,6 +1422,10 @@ void MockSSLClientSocket::OnReadComplete(const MockRead& data) {
NOTIMPLEMENTED();
}
+void MockSSLClientSocket::OnConnectComplete(const MockConnect& data) {
+ NOTIMPLEMENTED();
+}
+
MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data,
net::NetLog* net_log)
: connected_(false),
@@ -1526,6 +1545,10 @@ void MockUDPClientSocket::OnReadComplete(const MockRead& data) {
RunCallback(callback, rv);
}
+void MockUDPClientSocket::OnConnectComplete(const MockConnect& data) {
+ NOTIMPLEMENTED();
+}
+
int MockUDPClientSocket::CompleteRead() {
DCHECK(pending_buf_);
DCHECK(pending_buf_len_ > 0);
« no previous file with comments | « net/socket/socket_test_util.h ('k') | net/websockets/websocket_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698