jingle/notifier/base/fake_ssl_client_socket_unittest.cc - Issue 10491007: fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* a…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: jingle/notifier/base/fake_ssl_client_socket_unittest.cc

Issue 10491007: fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: PLT 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

« jingle/glue/pseudotcp_adapter.cc ('K') | « jingle/notifier/base/fake_ssl_client_socket.cc ('k') | jingle/notifier/base/proxy_resolving_client_socket.h » ('j') | net/socket/ssl_server_socket_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: jingle/notifier/base/fake_ssl_client_socket_unittest.cc

diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc

index 6584ee075fdf9d261072b9feed77530edbff2234..1641895bef1d2f4f7ef50881e04eb73cae58395a 100644

--- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc

+++ b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc

@@ -57,7 +57,7 @@ class MockClientSocket : public net::StreamSocket {

MOCK_METHOD0(Disconnect, void());

MOCK_CONST_METHOD0(IsConnected, bool());

MOCK_CONST_METHOD0(IsConnectedAndIdle, bool());

- MOCK_CONST_METHOD1(GetPeerAddress, int(net::AddressList*));

+ MOCK_CONST_METHOD1(GetPeerAddress, int(net::IPEndPoint*));

MOCK_CONST_METHOD1(GetLocalAddress, int(net::IPEndPoint*));

MOCK_CONST_METHOD0(NetLog, const net::BoundNetLog&());

MOCK_METHOD0(SetSubresourceSpeculation, void());

@@ -273,12 +273,12 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {

MockClientSocket* mock_client_socket = new MockClientSocket();

const int kReceiveBufferSize = 10;

const int kSendBufferSize = 20;

- net::AddressList address_list;

+ net::IPEndPoint ip_endpoint;

szym 2012/06/07 02:42:47 While you're here, could you initialize this so th

const int kPeerAddress = 30;

net::BoundNetLog net_log;

EXPECT_CALL(*mock_client_socket, SetReceiveBufferSize(kReceiveBufferSize));

EXPECT_CALL(*mock_client_socket, SetSendBufferSize(kSendBufferSize));

- EXPECT_CALL(*mock_client_socket, GetPeerAddress(&address_list)).

+ EXPECT_CALL(*mock_client_socket, GetPeerAddress(&ip_endpoint)).

WillOnce(Return(kPeerAddress));

EXPECT_CALL(*mock_client_socket, NetLog()).WillOnce(ReturnRef(net_log));

EXPECT_CALL(*mock_client_socket, SetSubresourceSpeculation());

@@ -289,7 +289,7 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {

fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize);

fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize);

EXPECT_EQ(kPeerAddress,

- fake_ssl_client_socket.GetPeerAddress(&address_list));

+ fake_ssl_client_socket.GetPeerAddress(&ip_endpoint));

EXPECT_EQ(&net_log, &fake_ssl_client_socket.NetLog());

fake_ssl_client_socket.SetSubresourceSpeculation();

fake_ssl_client_socket.SetOmniboxSpeculation();