| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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   scoped_refptr<net::HostResolver> resolver( | 68   scoped_refptr<net::HostResolver> resolver( | 
| 69       net::CreateSystemHostResolver(NULL)); | 69       net::CreateSystemHostResolver(NULL)); | 
| 70 | 70 | 
| 71   net::HostResolver::RequestInfo info("localhost", listen_port_); | 71   net::HostResolver::RequestInfo info("localhost", listen_port_); | 
| 72   int rv = resolver->Resolve(info, &addr, NULL, NULL, NULL); | 72   int rv = resolver->Resolve(info, &addr, NULL, NULL, net::BoundNetLog()); | 
| 73   EXPECT_EQ(rv, net::OK); | 73   EXPECT_EQ(rv, net::OK); | 
| 74 | 74 | 
| 75   net::TCPPinger pinger(addr); | 75   net::TCPPinger pinger(addr); | 
| 76   rv = pinger.Ping(); | 76   rv = pinger.Ping(); | 
| 77   EXPECT_EQ(rv, net::OK); | 77   EXPECT_EQ(rv, net::OK); | 
| 78 } | 78 } | 
| 79 | 79 | 
| 80 TEST_F(TCPPingerTest, PingFail) { | 80 TEST_F(TCPPingerTest, PingFail) { | 
| 81   net::AddressList addr; | 81   net::AddressList addr; | 
| 82   scoped_refptr<net::HostResolver> resolver( | 82   scoped_refptr<net::HostResolver> resolver( | 
| 83       net::CreateSystemHostResolver(NULL)); | 83       net::CreateSystemHostResolver(NULL)); | 
| 84 | 84 | 
| 85   // "Kill" "server" | 85   // "Kill" "server" | 
| 86   listen_sock_ = NULL; | 86   listen_sock_ = NULL; | 
| 87 | 87 | 
| 88   net::HostResolver::RequestInfo info("localhost", listen_port_); | 88   net::HostResolver::RequestInfo info("localhost", listen_port_); | 
| 89   int rv = resolver->Resolve(info, &addr, NULL, NULL, NULL); | 89   int rv = resolver->Resolve(info, &addr, NULL, NULL, net::BoundNetLog()); | 
| 90   EXPECT_EQ(rv, net::OK); | 90   EXPECT_EQ(rv, net::OK); | 
| 91 | 91 | 
| 92   net::TCPPinger pinger(addr); | 92   net::TCPPinger pinger(addr); | 
| 93   rv = pinger.Ping(base::TimeDelta::FromMilliseconds(100), 1); | 93   rv = pinger.Ping(base::TimeDelta::FromMilliseconds(100), 1); | 
| 94   EXPECT_NE(rv, net::OK); | 94   EXPECT_NE(rv, net::OK); | 
| 95 } | 95 } | 
| OLD | NEW | 
|---|