From ac9eec64de86f3d3a290a1a8b9321260cff7ed23 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Sat, 20 Feb 2010 18:50:38 +0000 Subject: Really connect to the same server in FTP network transaction. Also create necessary infrastructure to know the address a client socket is connected to. TEST=Covered by net_unittests. BUG=35670 Review URL: http://codereview.chromium.org/598071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39559 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/socket_test_util.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'net/socket/socket_test_util.cc') diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 1ea1ec9..1634106 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -9,6 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/message_loop.h" +#include "net/base/address_family.h" +#include "net/base/host_resolver_proc.h" #include "net/base/ssl_info.h" #include "net/socket/socket.h" #include "testing/gtest/include/gtest/gtest.h" @@ -47,9 +49,9 @@ bool MockClientSocket::IsConnectedAndIdle() const { return connected_; } -int MockClientSocket::GetPeerName(struct sockaddr* name, socklen_t* namelen) { - memset(reinterpret_cast(name), 0, *namelen); - return net::OK; +int MockClientSocket::GetPeerAddress(AddressList* address) const { + return net::SystemHostResolverProc("localhost", ADDRESS_FAMILY_UNSPECIFIED, + address); } void MockClientSocket::RunCallbackAsync(net::CompletionCallback* callback, @@ -370,12 +372,14 @@ void MockClientSocketFactory::ResetNextMockIndexes() { } MockTCPClientSocket* MockClientSocketFactory::GetMockTCPClientSocket( - int index) const { + size_t index) const { + DCHECK_LT(index, tcp_client_sockets_.size()); return tcp_client_sockets_[index]; } MockSSLClientSocket* MockClientSocketFactory::GetMockSSLClientSocket( - int index) const { + size_t index) const { + DCHECK_LT(index, ssl_client_sockets_.size()); return ssl_client_sockets_[index]; } -- cgit v1.1