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

Side by Side Diff: net/spdy/spdy_proxy_client_socket_spdy2_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/spdy/spdy_proxy_client_socket.h" 5 #include "net/spdy/spdy_proxy_client_socket.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "net/base/address_list.h" 10 #include "net/base/address_list.h"
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 }; 544 };
545 545
546 scoped_ptr<SpdyFrame> resp(ConstructConnectReplyFrame()); 546 scoped_ptr<SpdyFrame> resp(ConstructConnectReplyFrame());
547 MockRead reads[] = { 547 MockRead reads[] = {
548 CreateMockRead(*resp, 1, ASYNC), 548 CreateMockRead(*resp, 1, ASYNC),
549 MockRead(ASYNC, 0, 2), // EOF 549 MockRead(ASYNC, 0, 2), // EOF
550 }; 550 };
551 551
552 Initialize(reads, arraysize(reads), writes, arraysize(writes)); 552 Initialize(reads, arraysize(reads), writes, arraysize(writes));
553 553
554 net::AddressList addr; 554 net::IPEndPoint addr;
555 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr)); 555 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr));
556 556
557 AssertConnectSucceeds(); 557 AssertConnectSucceeds();
558 EXPECT_TRUE(sock_->IsConnected()); 558 EXPECT_TRUE(sock_->IsConnected());
559 EXPECT_EQ(OK, sock_->GetPeerAddress(&addr)); 559 EXPECT_EQ(OK, sock_->GetPeerAddress(&addr));
560 560
561 Run(1); 561 Run(1);
562 562
563 EXPECT_FALSE(sock_->IsConnected()); 563 EXPECT_FALSE(sock_->IsConnected());
564 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr)); 564 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr));
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 write_callback_.callback())); 1306 write_callback_.callback()));
1307 1307
1308 Run(2); 1308 Run(2);
1309 1309
1310 EXPECT_FALSE(sock_.get()); 1310 EXPECT_FALSE(sock_.get());
1311 EXPECT_TRUE(read_callback.have_result()); 1311 EXPECT_TRUE(read_callback.have_result());
1312 EXPECT_FALSE(write_callback_.have_result()); 1312 EXPECT_FALSE(write_callback_.have_result());
1313 } 1313 }
1314 1314
1315 } // namespace net 1315 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_proxy_client_socket.cc ('k') | net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698