| 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/socks_client_socket.h" | 5 #include "net/socket/socks_client_socket.h" | 
| 6 | 6 | 
|  | 7 #include "base/macros.h" | 
| 7 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" | 
| 8 #include "net/base/address_list.h" | 9 #include "net/base/address_list.h" | 
| 9 #include "net/base/test_completion_callback.h" | 10 #include "net/base/test_completion_callback.h" | 
| 10 #include "net/base/winsock_init.h" | 11 #include "net/base/winsock_init.h" | 
| 11 #include "net/dns/host_resolver.h" | 12 #include "net/dns/host_resolver.h" | 
| 12 #include "net/dns/mock_host_resolver.h" | 13 #include "net/dns/mock_host_resolver.h" | 
| 13 #include "net/log/net_log.h" | 14 #include "net/log/net_log.h" | 
| 14 #include "net/log/test_net_log.h" | 15 #include "net/log/test_net_log.h" | 
| 15 #include "net/log/test_net_log_entry.h" | 16 #include "net/log/test_net_log_entry.h" | 
| 16 #include "net/log/test_net_log_util.h" | 17 #include "net/log/test_net_log_util.h" | 
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 443                                NULL, 0, | 444                                NULL, 0, | 
| 444                                host_resolver.get(), | 445                                host_resolver.get(), | 
| 445                                kHostName, 80, | 446                                kHostName, 80, | 
| 446                                NULL); | 447                                NULL); | 
| 447 | 448 | 
| 448   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, | 449   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, | 
| 449             callback_.GetResult(user_sock_->Connect(callback_.callback()))); | 450             callback_.GetResult(user_sock_->Connect(callback_.callback()))); | 
| 450 } | 451 } | 
| 451 | 452 | 
| 452 }  // namespace net | 453 }  // namespace net | 
| OLD | NEW | 
|---|