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

Side by Side Diff: net/ftp/ftp_network_transaction.h

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 years, 8 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/ftp/ftp_network_layer.cc ('k') | net/ftp/ftp_network_transaction_unittest.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_FTP_FTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_FTP_FTP_NETWORK_TRANSACTION_H_
6 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_ 6 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 #include <utility> 12 #include <utility>
12 13
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/gtest_prod_util.h" 15 #include "base/gtest_prod_util.h"
15 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h"
17 #include "net/base/address_list.h" 17 #include "net/base/address_list.h"
18 #include "net/base/auth.h" 18 #include "net/base/auth.h"
19 #include "net/dns/host_resolver.h" 19 #include "net/dns/host_resolver.h"
20 #include "net/dns/single_request_host_resolver.h" 20 #include "net/dns/single_request_host_resolver.h"
21 #include "net/ftp/ftp_ctrl_response_buffer.h" 21 #include "net/ftp/ftp_ctrl_response_buffer.h"
22 #include "net/ftp/ftp_response_info.h" 22 #include "net/ftp/ftp_response_info.h"
23 #include "net/ftp/ftp_transaction.h" 23 #include "net/ftp/ftp_transaction.h"
24 #include "net/log/net_log.h" 24 #include "net/log/net_log.h"
25 25
26 namespace net { 26 namespace net {
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 const FtpRequestInfo* request_; 206 const FtpRequestInfo* request_;
207 FtpResponseInfo response_; 207 FtpResponseInfo response_;
208 208
209 // Cancels the outstanding request on destruction. 209 // Cancels the outstanding request on destruction.
210 SingleRequestHostResolver resolver_; 210 SingleRequestHostResolver resolver_;
211 AddressList addresses_; 211 AddressList addresses_;
212 212
213 // User buffer passed to the Read method for control socket. 213 // User buffer passed to the Read method for control socket.
214 scoped_refptr<IOBuffer> read_ctrl_buf_; 214 scoped_refptr<IOBuffer> read_ctrl_buf_;
215 215
216 scoped_ptr<FtpCtrlResponseBuffer> ctrl_response_buffer_; 216 std::unique_ptr<FtpCtrlResponseBuffer> ctrl_response_buffer_;
217 217
218 scoped_refptr<IOBuffer> read_data_buf_; 218 scoped_refptr<IOBuffer> read_data_buf_;
219 int read_data_buf_len_; 219 int read_data_buf_len_;
220 220
221 // Buffer holding the command line to be written to the control socket. 221 // Buffer holding the command line to be written to the control socket.
222 scoped_refptr<IOBufferWithSize> write_command_buf_; 222 scoped_refptr<IOBufferWithSize> write_command_buf_;
223 223
224 // Buffer passed to the Write method of control socket. It actually writes 224 // Buffer passed to the Write method of control socket. It actually writes
225 // to the write_command_buf_ at correct offset. 225 // to the write_command_buf_ at correct offset.
226 scoped_refptr<DrainableIOBuffer> write_buf_; 226 scoped_refptr<DrainableIOBuffer> write_buf_;
(...skipping 15 matching lines...) Expand all
242 AuthCredentials credentials_; 242 AuthCredentials credentials_;
243 243
244 // Current directory on the remote server, as returned by last PWD command, 244 // Current directory on the remote server, as returned by last PWD command,
245 // with any trailing slash removed. 245 // with any trailing slash removed.
246 std::string current_remote_directory_; 246 std::string current_remote_directory_;
247 247
248 uint16_t data_connection_port_; 248 uint16_t data_connection_port_;
249 249
250 ClientSocketFactory* socket_factory_; 250 ClientSocketFactory* socket_factory_;
251 251
252 scoped_ptr<StreamSocket> ctrl_socket_; 252 std::unique_ptr<StreamSocket> ctrl_socket_;
253 scoped_ptr<StreamSocket> data_socket_; 253 std::unique_ptr<StreamSocket> data_socket_;
254 254
255 State next_state_; 255 State next_state_;
256 256
257 // State to switch to after data connection is complete. 257 // State to switch to after data connection is complete.
258 State state_after_data_connect_complete_; 258 State state_after_data_connect_complete_;
259 }; 259 };
260 260
261 } // namespace net 261 } // namespace net
262 262
263 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 263 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/ftp/ftp_network_layer.cc ('k') | net/ftp/ftp_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698