diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 03:25:04 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 03:25:04 +0000 |
| commit | a1595312b958e430d54f55b7d93319d52da27d93 (patch) | |
| tree | 674e609b96ab985e09c149b6e0df25a441632413 /net/ftp/ftp_network_transaction.h | |
| parent | e99a796f5a7f1910e0da9400e5cabbc346ce1d37 (diff) | |
| download | chromium_src-a1595312b958e430d54f55b7d93319d52da27d93.zip chromium_src-a1595312b958e430d54f55b7d93319d52da27d93.tar.gz chromium_src-a1595312b958e430d54f55b7d93319d52da27d93.tar.bz2 | |
Fixes to socket_test_util.cc.
- Removes ref-counting from DelayedSocketData and OrderedSocketData.
- Calls CompleteRead (which reads from underlying data) only if
a Socket::Read call is "blocked" (previously returned with ERR_IO_PENDING).
- Removes unsafe pointers to the handed out sockets (the factory does not own them and cannot guarantee their lifetime).
BUG=110626
TEST=./net_unittests --gtest_filter=Spdy*:Http*:Socket*:WebSocket*:Ftp*
Review URL: http://codereview.chromium.org/9251019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp/ftp_network_transaction.h')
| -rw-r--r-- | net/ftp/ftp_network_transaction.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h index 3fec79d..be1cfdd 100644 --- a/net/ftp/ftp_network_transaction.h +++ b/net/ftp/ftp_network_transaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -49,6 +49,9 @@ class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction { virtual uint64 GetUploadProgress() const OVERRIDE; private: + FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest, + DownloadTransactionEvilPasvUnsafeHost); + enum Command { COMMAND_NONE, COMMAND_USER, |