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

Unified Diff: net/ftp/ftp_network_transaction.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: net/ftp/ftp_network_transaction.cc
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 3455fc6d7dfe2d400fba94303174308ff14ac95c..5843c614c30b8bb8b6895a2b4d04d9bf3ce1db1c 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -223,7 +223,8 @@ FtpNetworkTransaction::FtpNetworkTransaction(
data_connection_port_(0),
socket_factory_(socket_factory),
next_state_(STATE_NONE),
- state_after_data_connect_complete_(STATE_CTRL_WRITE_SIZE) {}
+ state_after_data_connect_complete_(STATE_CTRL_WRITE_SIZE) {
+}
FtpNetworkTransaction::~FtpNetworkTransaction() {
}
@@ -499,8 +500,8 @@ std::string FtpNetworkTransaction::GetRequestPathForFtpCommand(
// with a trailing slash.
if (!is_directory && path.length() > 1 && path[path.length() - 1] == '/')
path.erase(path.length() - 1);
- UnescapeRule::Type unescape_rules = UnescapeRule::SPACES |
- UnescapeRule::URL_SPECIAL_CHARS;
+ UnescapeRule::Type unescape_rules =
+ UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS;
// This may unescape to non-ASCII characters, but we allow that. See the
// comment for IsValidFTPCommandString.
path = net::UnescapeURLComponent(path, unescape_rules);
@@ -966,7 +967,7 @@ int FtpNetworkTransaction::ProcessResponseEPSV(
case ERROR_CLASS_INITIATED:
return Stop(ERR_INVALID_RESPONSE);
case ERROR_CLASS_OK:
- if (!ExtractPortFromEPSVResponse( response, &data_connection_port_))
+ if (!ExtractPortFromEPSVResponse(response, &data_connection_port_))
return Stop(ERR_INVALID_RESPONSE);
if (data_connection_port_ < 1024 ||
!IsPortAllowedByFtp(data_connection_port_))
@@ -1249,10 +1250,10 @@ int FtpNetworkTransaction::DoDataConnect() {
int rv = ctrl_socket_->GetPeerAddress(&ip_endpoint);
if (rv != OK)
return Stop(rv);
- data_address = AddressList::CreateFromIPAddress(
- ip_endpoint.address(), data_connection_port_);
+ data_address = AddressList::CreateFromIPAddress(ip_endpoint.address(),
+ data_connection_port_);
data_socket_ = socket_factory_->CreateTransportClientSocket(
- data_address, net_log_.net_log(), net_log_.source());
+ data_address, net_log_.net_log(), net_log_.source());
net_log_.AddEvent(
NetLog::TYPE_FTP_DATA_CONNECTION,
data_socket_->NetLog().source().ToEventParametersCallback());
@@ -1350,7 +1351,6 @@ void FtpNetworkTransaction::RecordDataConnectionError(int result) {
// Other kind of error.
NET_ERROR_OTHER = 20,
-
NUM_OF_NET_ERROR_TYPES
} type;
switch (result) {
@@ -1392,11 +1392,11 @@ void FtpNetworkTransaction::RecordDataConnectionError(int result) {
DCHECK(type >= 0 && type < NUM_OF_NET_ERROR_TYPES);
if (!had_error_type[type]) {
had_error_type[type] = true;
- UMA_HISTOGRAM_ENUMERATION("Net.FtpDataConnectionErrorHappened",
- type, NUM_OF_NET_ERROR_TYPES);
+ UMA_HISTOGRAM_ENUMERATION(
+ "Net.FtpDataConnectionErrorHappened", type, NUM_OF_NET_ERROR_TYPES);
}
- UMA_HISTOGRAM_ENUMERATION("Net.FtpDataConnectionErrorCount",
- type, NUM_OF_NET_ERROR_TYPES);
+ UMA_HISTOGRAM_ENUMERATION(
+ "Net.FtpDataConnectionErrorCount", type, NUM_OF_NET_ERROR_TYPES);
}
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698