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

Side by Side Diff: net/socket/socks5_client_socket_unittest.cc

Issue 9716020: Add base::HostToNetXX() & NetToHostXX(), and use them to replace htonX() & ntohX() in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 9 months 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
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <map> 8 #include <map>
9 9
10 #include "base/sys_byteorder.h"
10 #include "net/base/address_list.h" 11 #include "net/base/address_list.h"
11 #include "net/base/net_log.h" 12 #include "net/base/net_log.h"
12 #include "net/base/net_log_unittest.h" 13 #include "net/base/net_log_unittest.h"
13 #include "net/base/mock_host_resolver.h" 14 #include "net/base/mock_host_resolver.h"
14 #include "net/base/sys_addrinfo.h" 15 #include "net/base/sys_addrinfo.h"
15 #include "net/base/test_completion_callback.h" 16 #include "net/base/test_completion_callback.h"
16 #include "net/base/winsock_init.h" 17 #include "net/base/winsock_init.h"
17 #include "net/socket/client_socket_factory.h" 18 #include "net/socket/client_socket_factory.h"
18 #include "net/socket/socket_test_util.h" 19 #include "net/socket/socket_test_util.h"
19 #include "net/socket/tcp_client_socket.h" 20 #include "net/socket/tcp_client_socket.h"
(...skipping 29 matching lines...) Expand all
49 StreamSocket* tcp_sock_; 50 StreamSocket* tcp_sock_;
50 TestCompletionCallback callback_; 51 TestCompletionCallback callback_;
51 scoped_ptr<MockHostResolver> host_resolver_; 52 scoped_ptr<MockHostResolver> host_resolver_;
52 scoped_ptr<SocketDataProvider> data_; 53 scoped_ptr<SocketDataProvider> data_;
53 54
54 private: 55 private:
55 DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest); 56 DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest);
56 }; 57 };
57 58
58 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest() 59 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
59 : kNwPort(htons(80)), 60 : kNwPort(base::HostToNet16(80)),
60 net_log_(CapturingNetLog::kUnbounded), 61 net_log_(CapturingNetLog::kUnbounded),
61 host_resolver_(new MockHostResolver) { 62 host_resolver_(new MockHostResolver) {
62 } 63 }
63 64
64 // Set up platform before every test case 65 // Set up platform before every test case
65 void SOCKS5ClientSocketTest::SetUp() { 66 void SOCKS5ClientSocketTest::SetUp() {
66 PlatformTest::SetUp(); 67 PlatformTest::SetUp();
67 68
68 // Resolve the "localhost" AddressList used by the TCP connection to connect. 69 // Resolve the "localhost" AddressList used by the TCP connection to connect.
69 HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080)); 70 HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080));
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 EXPECT_TRUE(user_sock_->IsConnected()); 358 EXPECT_TRUE(user_sock_->IsConnected());
358 net_log_.GetEntries(&net_log_entries); 359 net_log_.GetEntries(&net_log_entries);
359 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, 360 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
360 NetLog::TYPE_SOCKS5_CONNECT)); 361 NetLog::TYPE_SOCKS5_CONNECT));
361 } 362 }
362 } 363 }
363 364
364 } // namespace 365 } // namespace
365 366
366 } // namespace net 367 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698