| 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 eb09b96786793f83dd7b1da3b18fc03f0276e028..9682eb7486bb47482d6419ce732a74fd0b95de65 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server.cc
|
| +++ b/net/test/embedded_test_server/embedded_test_server.cc
|
| @@ -295,6 +295,19 @@ void EmbeddedTestServer::RegisterDefaultHandler(
|
| default_request_handlers_.push_back(callback);
|
| }
|
|
|
| +bool EmbeddedTestServer::FlushAllSocketsAndConnectionsOnUIThread() {
|
| + bool r = PostTaskToIOThreadAndWait(
|
| + base::Bind(&EmbeddedTestServer::FlushAllSocketsAndConnections,
|
| + base::Unretained(this)));
|
| + return r;
|
| +}
|
| +
|
| +void EmbeddedTestServer::FlushAllSocketsAndConnections() {
|
| + STLDeleteContainerPairSecondPointers(connections_.begin(),
|
| + connections_.end());
|
| + connections_.clear();
|
| +}
|
| +
|
| scoped_ptr<StreamSocket> EmbeddedTestServer::DoSSLUpgrade(
|
| scoped_ptr<StreamSocket> connection) {
|
| DCHECK(io_thread_->task_runner()->BelongsToCurrentThread());
|
| @@ -374,7 +387,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;
|
|
|