| Index: net/test/embedded_test_server/embedded_test_server.cc
|
| diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc
|
| index 2464d9134bda33e41d2f1336210bba5b9fc56bec..59714e33d4042f8aa5de4ae9f759aacfee97aee3 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server.cc
|
| +++ b/net/test/embedded_test_server/embedded_test_server.cc
|
| @@ -315,6 +315,18 @@ void EmbeddedTestServer::DoAcceptLoop() {
|
| }
|
| }
|
|
|
| +bool EmbeddedTestServer::FlushAllSocketsAndConnectionsOnUIThread() {
|
| + return PostTaskToIOThreadAndWait(
|
| + base::Bind(&EmbeddedTestServer::FlushAllSocketsAndConnections,
|
| + base::Unretained(this)));
|
| +}
|
| +
|
| +void EmbeddedTestServer::FlushAllSocketsAndConnections() {
|
| + STLDeleteContainerPairSecondPointers(connections_.begin(),
|
| + connections_.end());
|
| + connections_.clear();
|
| +}
|
| +
|
| void EmbeddedTestServer::OnAcceptCompleted(int rv) {
|
| DCHECK_NE(ERR_IO_PENDING, rv);
|
| HandleAcceptResult(std::move(accepted_socket_));
|
| @@ -376,7 +388,7 @@ void EmbeddedTestServer::OnReadCompleted(HttpConnection* connection, int rv) {
|
| bool EmbeddedTestServer::HandleReadResult(HttpConnection* connection, int rv) {
|
| DCHECK(io_thread_->task_runner()->BelongsToCurrentThread());
|
| if (connection_listener_)
|
| - connection_listener_->ReadFromSocket(*connection->socket_);
|
| + connection_listener_->ReadFromSocket(*connection->socket_, rv);
|
| if (rv <= 0) {
|
| DidClose(connection);
|
| return false;
|
|
|