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

Side by Side Diff: net/socket/socks_client_socket.h

Issue 2214693002: First step to remove SingleRequestHostResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: single Created 4 years, 4 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
« no previous file with comments | « net/quic/chromium/quic_stream_factory.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 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 13
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "net/base/address_list.h" 17 #include "net/base/address_list.h"
18 #include "net/base/completion_callback.h" 18 #include "net/base/completion_callback.h"
19 #include "net/base/net_errors.h" 19 #include "net/base/net_errors.h"
20 #include "net/dns/host_resolver.h" 20 #include "net/dns/host_resolver.h"
21 #include "net/dns/single_request_host_resolver.h"
22 #include "net/log/net_log.h" 21 #include "net/log/net_log.h"
23 #include "net/socket/stream_socket.h" 22 #include "net/socket/stream_socket.h"
24 23
25 namespace net { 24 namespace net {
26 25
27 class ClientSocketHandle; 26 class ClientSocketHandle;
28 class BoundNetLog; 27 class BoundNetLog;
29 28
30 // The SOCKS client socket implementation 29 // The SOCKS client socket implementation
31 class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { 30 class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 bool completed_handshake_; 123 bool completed_handshake_;
125 124
126 // These contain the bytes sent / received by the SOCKS handshake. 125 // These contain the bytes sent / received by the SOCKS handshake.
127 size_t bytes_sent_; 126 size_t bytes_sent_;
128 size_t bytes_received_; 127 size_t bytes_received_;
129 128
130 // This becomes true when the socket is used to send or receive data. 129 // This becomes true when the socket is used to send or receive data.
131 bool was_ever_used_; 130 bool was_ever_used_;
132 131
133 // Used to resolve the hostname to which the SOCKS proxy will connect. 132 // Used to resolve the hostname to which the SOCKS proxy will connect.
134 SingleRequestHostResolver host_resolver_; 133 HostResolver* host_resolver_;
134 std::unique_ptr<HostResolver::Request> request_;
135 AddressList addresses_; 135 AddressList addresses_;
136 HostResolver::RequestInfo host_request_info_; 136 HostResolver::RequestInfo host_request_info_;
137 RequestPriority priority_; 137 RequestPriority priority_;
138 138
139 BoundNetLog net_log_; 139 BoundNetLog net_log_;
140 140
141 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket); 141 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);
142 }; 142 };
143 143
144 } // namespace net 144 } // namespace net
145 145
146 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 146 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
OLDNEW
« no previous file with comments | « net/quic/chromium/quic_stream_factory.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698