Chromium Code Reviews

Unified Diff: net/base/ssl_client_socket_unittest.cc

Issue 118100: Avoid doing concurrent DNS resolves of the same hostname (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Get compiling on mac Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: net/base/ssl_client_socket_unittest.cc
===================================================================
--- net/base/ssl_client_socket_unittest.cc (revision 18213)
+++ net/base/ssl_client_socket_unittest.cc (working copy)
@@ -77,7 +77,7 @@
TestCompletionCallback callback;
int rv = resolver.Resolve(server_.kHostName, server_.kOKHTTPSPort,
- &addr, NULL);
+ &addr, NULL, NULL);
EXPECT_EQ(net::OK, rv);
net::ClientSocket *transport = new net::TCPClientSocket(addr);
@@ -115,7 +115,7 @@
TestCompletionCallback callback;
int rv = resolver.Resolve(server_.kHostName, server_.kBadHTTPSPort,
- &addr, NULL);
+ &addr, NULL, NULL);
EXPECT_EQ(net::OK, rv);
net::ClientSocket *transport = new net::TCPClientSocket(addr);
@@ -152,7 +152,7 @@
TestCompletionCallback callback;
int rv = resolver.Resolve(server_.kMismatchedHostName, server_.kOKHTTPSPort,
- &addr, NULL);
+ &addr, NULL, NULL);
EXPECT_EQ(net::OK, rv);
net::ClientSocket *transport = new net::TCPClientSocket(addr);
@@ -194,7 +194,7 @@
TestCompletionCallback callback;
int rv = resolver.Resolve(server_.kHostName, server_.kOKHTTPSPort,
- &addr, &callback);
+ &addr, &callback, NULL);
EXPECT_EQ(net::ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -255,7 +255,7 @@
TestCompletionCallback callback;
int rv = resolver.Resolve(server_.kHostName, server_.kOKHTTPSPort,
- &addr, NULL);
+ &addr, NULL, NULL);
EXPECT_EQ(net::OK, rv);
net::ClientSocket *transport = new net::TCPClientSocket(addr);
@@ -311,7 +311,7 @@
TestCompletionCallback callback;
int rv = resolver.Resolve(server_.kHostName, server_.kOKHTTPSPort,
- &addr, NULL);
+ &addr, NULL, NULL);
EXPECT_EQ(net::OK, rv);
net::ClientSocket *transport = new net::TCPClientSocket(addr);

Powered by Google App Engine