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

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

Issue 9251019: Fixes to socket_test_util.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unsafe pointers to sockets. Created 8 years, 11 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 const BoundNetLog& net_log) OVERRIDE; 42 const BoundNetLog& net_log) OVERRIDE;
43 virtual int RestartWithAuth(const AuthCredentials& credentials, 43 virtual int RestartWithAuth(const AuthCredentials& credentials,
44 const CompletionCallback& callback) OVERRIDE; 44 const CompletionCallback& callback) OVERRIDE;
45 virtual int Read(IOBuffer* buf, int buf_len, 45 virtual int Read(IOBuffer* buf, int buf_len,
46 const CompletionCallback& callback) OVERRIDE; 46 const CompletionCallback& callback) OVERRIDE;
47 virtual const FtpResponseInfo* GetResponseInfo() const OVERRIDE; 47 virtual const FtpResponseInfo* GetResponseInfo() const OVERRIDE;
48 virtual LoadState GetLoadState() const OVERRIDE; 48 virtual LoadState GetLoadState() const OVERRIDE;
49 virtual uint64 GetUploadProgress() const OVERRIDE; 49 virtual uint64 GetUploadProgress() const OVERRIDE;
50 50
51 private: 51 private:
52 FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest,
53 DownloadTransactionEvilPasvUnsafeHost);
54
52 enum Command { 55 enum Command {
53 COMMAND_NONE, 56 COMMAND_NONE,
54 COMMAND_USER, 57 COMMAND_USER,
55 COMMAND_PASS, 58 COMMAND_PASS,
56 COMMAND_SYST, 59 COMMAND_SYST,
57 COMMAND_TYPE, 60 COMMAND_TYPE,
58 COMMAND_EPSV, 61 COMMAND_EPSV,
59 COMMAND_PASV, 62 COMMAND_PASV,
60 COMMAND_PWD, 63 COMMAND_PWD,
61 COMMAND_SIZE, 64 COMMAND_SIZE,
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 246
244 scoped_ptr<StreamSocket> ctrl_socket_; 247 scoped_ptr<StreamSocket> ctrl_socket_;
245 scoped_ptr<StreamSocket> data_socket_; 248 scoped_ptr<StreamSocket> data_socket_;
246 249
247 State next_state_; 250 State next_state_;
248 }; 251 };
249 252
250 } // namespace net 253 } // namespace net
251 254
252 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 255 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698