OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "base/ref_counted.h" | 5 #include "base/ref_counted.h" |
6 #include "base/trace_event.h" | 6 #include "base/trace_event.h" |
7 #include "net/base/address_list.h" | 7 #include "net/base/address_list.h" |
8 #include "net/base/host_resolver.h" | 8 #include "net/base/host_resolver.h" |
9 #include "net/base/listen_socket.h" | 9 #include "net/base/listen_socket.h" |
10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 listen_sock_ = ListenSocket::Listen("127.0.0.1", listen_port_, this); | 60 listen_sock_ = ListenSocket::Listen("127.0.0.1", listen_port_, this); |
61 if (listen_sock_.get()) break; | 61 if (listen_sock_.get()) break; |
62 } | 62 } |
63 ASSERT_TRUE(listen_sock_.get() != NULL); | 63 ASSERT_TRUE(listen_sock_.get() != NULL); |
64 } | 64 } |
65 | 65 |
66 TEST_F(TCPPingerTest, Ping) { | 66 TEST_F(TCPPingerTest, Ping) { |
67 net::AddressList addr; | 67 net::AddressList addr; |
68 net::HostResolver resolver; | 68 net::HostResolver resolver; |
69 | 69 |
70 int rv = resolver.Resolve("localhost", listen_port_, &addr, NULL, NULL); | 70 net::HostResolver::RequestInfo info("localhost", listen_port_); |
| 71 int rv = resolver.Resolve(info, &addr, NULL, NULL); |
71 EXPECT_EQ(rv, net::OK); | 72 EXPECT_EQ(rv, net::OK); |
72 | 73 |
73 net::TCPPinger pinger(addr); | 74 net::TCPPinger pinger(addr); |
74 rv = pinger.Ping(); | 75 rv = pinger.Ping(); |
75 EXPECT_EQ(rv, net::OK); | 76 EXPECT_EQ(rv, net::OK); |
76 } | 77 } |
77 | 78 |
78 TEST_F(TCPPingerTest, PingFail) { | 79 TEST_F(TCPPingerTest, PingFail) { |
79 net::AddressList addr; | 80 net::AddressList addr; |
80 net::HostResolver resolver; | 81 net::HostResolver resolver; |
81 | 82 |
82 // "Kill" "server" | 83 // "Kill" "server" |
83 listen_sock_ = NULL; | 84 listen_sock_ = NULL; |
84 | 85 |
85 int rv = resolver.Resolve("localhost", listen_port_, &addr, NULL, NULL); | 86 net::HostResolver::RequestInfo info("localhost", listen_port_); |
| 87 int rv = resolver.Resolve(info, &addr, NULL, NULL); |
86 EXPECT_EQ(rv, net::OK); | 88 EXPECT_EQ(rv, net::OK); |
87 | 89 |
88 net::TCPPinger pinger(addr); | 90 net::TCPPinger pinger(addr); |
89 rv = pinger.Ping(base::TimeDelta::FromMilliseconds(100), 1); | 91 rv = pinger.Ping(base::TimeDelta::FromMilliseconds(100), 1); |
90 EXPECT_NE(rv, net::OK); | 92 EXPECT_NE(rv, net::OK); |
91 } | 93 } |
OLD | NEW |