net/socket/ssl_client_socket_unittest.cc - Issue 149511: Refactorings surrounding HostResolver:...

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 149511: Refactorings surrounding HostResolver:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Merge in socks5_client_socket_unittest.cc Created 11 years, 5 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

Index: net/socket/ssl_client_socket_unittest.cc

===================================================================

--- net/socket/ssl_client_socket_unittest.cc (revision 20760)

+++ net/socket/ssl_client_socket_unittest.cc (working copy)

@@ -23,7 +23,8 @@

class SSLClientSocketTest : public PlatformTest {

public:

SSLClientSocketTest()

- : socket_factory_(net::ClientSocketFactory::GetDefaultFactory()) {

+ : resolver_(net::CreateSystemHostResolver()),

+ socket_factory_(net::ClientSocketFactory::GetDefaultFactory()) {

}

void StartOKServer() {

@@ -48,6 +49,7 @@

}

protected:

+ scoped_refptr<net::HostResolver> resolver_;

net::ClientSocketFactory* socket_factory_;

net::TestServerLauncher server_;

};

@@ -86,11 +88,10 @@

StartOKServer();

net::AddressList addr;

- scoped_refptr<net::HostResolver> resolver(new net::HostResolver);

TestCompletionCallback callback;

net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);

- int rv = resolver->Resolve(info, &addr, NULL, NULL);

+ int rv = resolver_->Resolve(info, &addr, NULL, NULL);

EXPECT_EQ(net::OK, rv);

net::ClientSocket *transport = new net::TCPClientSocket(addr);

@@ -124,11 +125,10 @@

StartExpiredServer();

net::AddressList addr;

- scoped_refptr<net::HostResolver> resolver(new net::HostResolver);

TestCompletionCallback callback;

net::HostResolver::RequestInfo info(server_.kHostName, server_.kBadHTTPSPort);

- int rv = resolver->Resolve(info, &addr, NULL, NULL);

+ int rv = resolver_->Resolve(info, &addr, NULL, NULL);

EXPECT_EQ(net::OK, rv);

net::ClientSocket *transport = new net::TCPClientSocket(addr);

@@ -161,12 +161,11 @@

StartMismatchedServer();

net::AddressList addr;

- scoped_refptr<net::HostResolver> resolver(new net::HostResolver);

TestCompletionCallback callback;

net::HostResolver::RequestInfo info(server_.kMismatchedHostName,

server_.kOKHTTPSPort);

- int rv = resolver->Resolve(info, &addr, NULL, NULL);

+ int rv = resolver_->Resolve(info, &addr, NULL, NULL);

EXPECT_EQ(net::OK, rv);

net::ClientSocket *transport = new net::TCPClientSocket(addr);

@@ -204,11 +203,10 @@

StartOKServer();

net::AddressList addr;

- scoped_refptr<net::HostResolver> resolver(new net::HostResolver);

TestCompletionCallback callback;

net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);

- int rv = resolver->Resolve(info, &addr, &callback, NULL);

+ int rv = resolver_->Resolve(info, &addr, &callback, NULL);

EXPECT_EQ(net::ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

@@ -265,11 +263,10 @@

StartOKServer();

net::AddressList addr;

- scoped_refptr<net::HostResolver> resolver(new net::HostResolver);

TestCompletionCallback callback;

net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);

- int rv = resolver->Resolve(info, &addr, NULL, NULL);

+ int rv = resolver_->Resolve(info, &addr, NULL, NULL);

EXPECT_EQ(net::OK, rv);

net::ClientSocket *transport = new net::TCPClientSocket(addr);

@@ -321,11 +318,10 @@

StartOKServer();

net::AddressList addr;

- scoped_refptr<net::HostResolver> resolver(new net::HostResolver);

TestCompletionCallback callback;

net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);

- int rv = resolver->Resolve(info, &addr, NULL, NULL);

+ int rv = resolver_->Resolve(info, &addr, NULL, NULL);

EXPECT_EQ(net::OK, rv);

net::ClientSocket *transport = new net::TCPClientSocket(addr);

« no previous file with comments | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/ssl_test_util.cc » ('j') | no next file with comments »