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

Unified Diff: net/test/embedded_test_server/embedded_test_server.cc

Issue 1881463003: Add a browsertest suite for net predictor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke@ review Created 4 years, 8 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
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 152d46020691d3398d569b1ae219657ca883e145..e16a28cd679948c06081d5e36a4d10337c963644 100644
--- a/net/test/embedded_test_server/embedded_test_server.cc
+++ b/net/test/embedded_test_server/embedded_test_server.cc
@@ -296,6 +296,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();
+}
+
std::unique_ptr<StreamSocket> EmbeddedTestServer::DoSSLUpgrade(
std::unique_ptr<StreamSocket> connection) {
DCHECK(io_thread_->task_runner()->BelongsToCurrentThread());
@@ -376,7 +389,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;

Powered by Google App Engine
This is Rietveld 408576698