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

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

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: get_canonical_name -> canonical_name. iterator to indexing Created 8 years, 7 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 <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 10
11 #include "base/sys_byteorder.h" 11 #include "base/sys_byteorder.h"
12 #include "net/base/address_list.h" 12 #include "net/base/address_list.h"
13 #include "net/base/net_log.h" 13 #include "net/base/net_log.h"
14 #include "net/base/net_log_unittest.h" 14 #include "net/base/net_log_unittest.h"
15 #include "net/base/mock_host_resolver.h" 15 #include "net/base/mock_host_resolver.h"
16 #include "net/base/sys_addrinfo.h"
17 #include "net/base/test_completion_callback.h" 16 #include "net/base/test_completion_callback.h"
18 #include "net/base/winsock_init.h" 17 #include "net/base/winsock_init.h"
19 #include "net/socket/client_socket_factory.h" 18 #include "net/socket/client_socket_factory.h"
20 #include "net/socket/socket_test_util.h" 19 #include "net/socket/socket_test_util.h"
21 #include "net/socket/tcp_client_socket.h" 20 #include "net/socket/tcp_client_socket.h"
22 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
23 #include "testing/platform_test.h" 22 #include "testing/platform_test.h"
24 23
25 //----------------------------------------------------------------------------- 24 //-----------------------------------------------------------------------------
26 25
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 EXPECT_TRUE(user_sock_->IsConnected()); 358 EXPECT_TRUE(user_sock_->IsConnected());
360 net_log_.GetEntries(&net_log_entries); 359 net_log_.GetEntries(&net_log_entries);
361 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1, 360 EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
362 NetLog::TYPE_SOCKS5_CONNECT)); 361 NetLog::TYPE_SOCKS5_CONNECT));
363 } 362 }
364 } 363 }
365 364
366 } // namespace 365 } // namespace
367 366
368 } // 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