OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/socket/socks5_client_socket.h" | 5 #include "net/socket/socks5_client_socket.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "net/base/address_list.h" | 10 #include "net/base/address_list.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 net_log_(CapturingNetLog::kUnbounded), | 60 net_log_(CapturingNetLog::kUnbounded), |
61 host_resolver_(new MockHostResolver) { | 61 host_resolver_(new MockHostResolver) { |
62 } | 62 } |
63 | 63 |
64 // Set up platform before every test case | 64 // Set up platform before every test case |
65 void SOCKS5ClientSocketTest::SetUp() { | 65 void SOCKS5ClientSocketTest::SetUp() { |
66 PlatformTest::SetUp(); | 66 PlatformTest::SetUp(); |
67 | 67 |
68 // Resolve the "localhost" AddressList used by the TCP connection to connect. | 68 // Resolve the "localhost" AddressList used by the TCP connection to connect. |
69 HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080)); | 69 HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080)); |
70 TestOldCompletionCallback callback; | 70 TestCompletionCallback callback; |
71 int rv = host_resolver_->Resolve(info, &address_list_, &callback, NULL, | 71 int rv = host_resolver_->Resolve(info, &address_list_, callback.callback(), |
72 BoundNetLog()); | 72 NULL, BoundNetLog()); |
73 ASSERT_EQ(ERR_IO_PENDING, rv); | 73 ASSERT_EQ(ERR_IO_PENDING, rv); |
74 rv = callback.WaitForResult(); | 74 rv = callback.WaitForResult(); |
75 ASSERT_EQ(OK, rv); | 75 ASSERT_EQ(OK, rv); |
76 } | 76 } |
77 | 77 |
78 SOCKS5ClientSocket* SOCKS5ClientSocketTest::BuildMockSocket( | 78 SOCKS5ClientSocket* SOCKS5ClientSocketTest::BuildMockSocket( |
79 MockRead reads[], | 79 MockRead reads[], |
80 size_t reads_count, | 80 size_t reads_count, |
81 MockWrite writes[], | 81 MockWrite writes[], |
82 size_t writes_count, | 82 size_t writes_count, |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 EXPECT_TRUE(user_sock_->IsConnected()); | 357 EXPECT_TRUE(user_sock_->IsConnected()); |
358 net_log_.GetEntries(&net_log_entries); | 358 net_log_.GetEntries(&net_log_entries); |
359 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, | 359 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, |
360 NetLog::TYPE_SOCKS5_CONNECT)); | 360 NetLog::TYPE_SOCKS5_CONNECT)); |
361 } | 361 } |
362 } | 362 } |
363 | 363 |
364 } // namespace | 364 } // namespace |
365 | 365 |
366 } // namespace net | 366 } // namespace net |
OLD | NEW |