OLD | NEW |
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/socket/socks5_client_socket.h" | 5 #include "net/socket/socks5_client_socket.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 | 10 |
| 11 #include "base/macros.h" |
11 #include "base/sys_byteorder.h" | 12 #include "base/sys_byteorder.h" |
12 #include "net/base/address_list.h" | 13 #include "net/base/address_list.h" |
13 #include "net/base/test_completion_callback.h" | 14 #include "net/base/test_completion_callback.h" |
14 #include "net/base/winsock_init.h" | 15 #include "net/base/winsock_init.h" |
15 #include "net/dns/mock_host_resolver.h" | 16 #include "net/dns/mock_host_resolver.h" |
16 #include "net/log/net_log.h" | 17 #include "net/log/net_log.h" |
17 #include "net/log/test_net_log.h" | 18 #include "net/log/test_net_log.h" |
18 #include "net/log/test_net_log_entry.h" | 19 #include "net/log/test_net_log_entry.h" |
19 #include "net/log/test_net_log_util.h" | 20 #include "net/log/test_net_log_util.h" |
20 #include "net/socket/client_socket_factory.h" | 21 #include "net/socket/client_socket_factory.h" |
(...skipping 17 matching lines...) Expand all Loading... |
38 size_t reads_count, | 39 size_t reads_count, |
39 MockWrite writes[], | 40 MockWrite writes[], |
40 size_t writes_count, | 41 size_t writes_count, |
41 const std::string& hostname, | 42 const std::string& hostname, |
42 int port, | 43 int port, |
43 NetLog* net_log); | 44 NetLog* net_log); |
44 | 45 |
45 void SetUp() override; | 46 void SetUp() override; |
46 | 47 |
47 protected: | 48 protected: |
48 const uint16 kNwPort; | 49 const uint16_t kNwPort; |
49 TestNetLog net_log_; | 50 TestNetLog net_log_; |
50 scoped_ptr<SOCKS5ClientSocket> user_sock_; | 51 scoped_ptr<SOCKS5ClientSocket> user_sock_; |
51 AddressList address_list_; | 52 AddressList address_list_; |
52 // Filled in by BuildMockSocket() and owned by its return value | 53 // Filled in by BuildMockSocket() and owned by its return value |
53 // (which |user_sock| is set to). | 54 // (which |user_sock| is set to). |
54 StreamSocket* tcp_sock_; | 55 StreamSocket* tcp_sock_; |
55 TestCompletionCallback callback_; | 56 TestCompletionCallback callback_; |
56 scoped_ptr<MockHostResolver> host_resolver_; | 57 scoped_ptr<MockHostResolver> host_resolver_; |
57 scoped_ptr<SocketDataProvider> data_; | 58 scoped_ptr<SocketDataProvider> data_; |
58 | 59 |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 EXPECT_TRUE(user_sock_->IsConnected()); | 373 EXPECT_TRUE(user_sock_->IsConnected()); |
373 net_log_.GetEntries(&net_log_entries); | 374 net_log_.GetEntries(&net_log_entries); |
374 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, | 375 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, |
375 NetLog::TYPE_SOCKS5_CONNECT)); | 376 NetLog::TYPE_SOCKS5_CONNECT)); |
376 } | 377 } |
377 } | 378 } |
378 | 379 |
379 } // namespace | 380 } // namespace |
380 | 381 |
381 } // namespace net | 382 } // namespace net |
OLD | NEW |