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

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: fix according to review Created 8 years, 6 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: 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..30ac3b72cbec8c363a37170ba04787111399ec5e 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(net::IPAddressNumber(net::kIPv4AddressSize), 80);
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();
« no previous file with comments | « jingle/notifier/base/fake_ssl_client_socket.cc ('k') | jingle/notifier/base/proxy_resolving_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698