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

Side by Side Diff: net/spdy/spdy_proxy_client_socket_unittest.cc

Issue 8771012: Fix crash bug in SpdyProxyClientSocket.GetPeerAddress where (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "net/base/address_list.h" 8 #include "net/base/address_list.h"
9 #include "net/base/net_log.h" 9 #include "net/base/net_log.h"
10 #include "net/base/net_log_unittest.h" 10 #include "net/base/net_log_unittest.h"
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 605
606 Initialize(reads, arraysize(reads), writes, arraysize(writes)); 606 Initialize(reads, arraysize(reads), writes, arraysize(writes));
607 607
608 net::AddressList addr; 608 net::AddressList addr;
609 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr)); 609 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr));
610 610
611 AssertConnectSucceeds(); 611 AssertConnectSucceeds();
612 EXPECT_TRUE(sock_->IsConnected()); 612 EXPECT_TRUE(sock_->IsConnected());
613 EXPECT_EQ(OK, sock_->GetPeerAddress(&addr)); 613 EXPECT_EQ(OK, sock_->GetPeerAddress(&addr));
614 614
615 Run(1);
616
617 // Socket is now closed, but still connected
618 EXPECT_TRUE(sock_->IsConnected());
619 EXPECT_EQ(OK, sock_->GetPeerAddress(&addr));
620
615 sock_->Disconnect(); 621 sock_->Disconnect();
616 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr)); 622 EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, sock_->GetPeerAddress(&addr));
617 } 623 }
618 624
619 // ----------- Write 625 // ----------- Write
620 626
621 TEST_F(SpdyProxyClientSocketTest, WriteSendsDataInDataFrame) { 627 TEST_F(SpdyProxyClientSocketTest, WriteSendsDataInDataFrame) {
622 scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); 628 scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame());
623 scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); 629 scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1));
624 scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); 630 scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2));
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 &write_callback_)); 1333 &write_callback_));
1328 1334
1329 Run(2); 1335 Run(2);
1330 1336
1331 EXPECT_FALSE(sock_.get()); 1337 EXPECT_FALSE(sock_.get());
1332 EXPECT_TRUE(read_callback.have_result()); 1338 EXPECT_TRUE(read_callback.have_result());
1333 EXPECT_FALSE(write_callback_.have_result()); 1339 EXPECT_FALSE(write_callback_.have_result());
1334 } 1340 }
1335 1341
1336 } // namespace net 1342 } // namespace net
OLDNEW
« net/spdy/spdy_proxy_client_socket.cc ('K') | « net/spdy/spdy_proxy_client_socket.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698