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

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 10454066: Move the core state machine of SSLClientSocketNSS into a thread-safe Core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 10f33ec52996a4f681531e6a280f22667ae10bcf..616ac3f410ebeb0c48773ef8f858cf1f655ce880 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -652,6 +652,8 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) {
kDefaultSSLConfig));
rv = sock->Connect(callback.callback());
+ if (rv == net::ERR_IO_PENDING)
+ rv = callback.WaitForResult();
wtc 2012/05/30 22:54:29 Nit: there is a convenience function for doing thi
Ryan Sleevi 2012/05/30 23:20:10 Right, I was following the pattern that existed wi
EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, rv);
}

Powered by Google App Engine
This is Rietveld 408576698