Index: net/ftp/ftp_network_transaction_unittest.cc |
=================================================================== |
--- net/ftp/ftp_network_transaction_unittest.cc (revision 123143) |
+++ net/ftp/ftp_network_transaction_unittest.cc (working copy) |
@@ -60,7 +60,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_USER: |
return Verify("USER anonymous\r\n", data, PRE_PASSWD, |
@@ -92,7 +92,7 @@ |
return Verify("QUIT\r\n", data, QUIT, "221 Goodbye.\r\n"); |
default: |
NOTREACHED() << "State not handled " << state(); |
- return MockWriteResult(true, ERR_UNEXPECTED); |
+ return MockWriteResult(ASYNC, ERR_UNEXPECTED); |
} |
} |
@@ -148,9 +148,9 @@ |
if (expected == data) { |
state_ = next_state; |
SimulateRead(next_read, next_read_length); |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
} |
- return MockWriteResult(true, ERR_UNEXPECTED); |
+ return MockWriteResult(ASYNC, ERR_UNEXPECTED); |
} |
MockWriteResult Verify(const std::string& expected, |
@@ -184,7 +184,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /\r\n", data, PRE_CWD, |
@@ -210,7 +210,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_EPSV: |
return Verify("EPSV\r\n", data, PRE_PASV, |
@@ -236,7 +236,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /\r\n", data, PRE_CWD, "213 0\r\n"); |
@@ -256,7 +256,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SYST: |
return Verify("SYST\r\n", data, PRE_PWD, "215 VMS\r\n"); |
@@ -293,7 +293,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SYST: |
return Verify("SYST\r\n", data, PRE_PWD, "215 VMS\r\n"); |
@@ -332,7 +332,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /file\r\n", data, PRE_RETR, |
@@ -355,7 +355,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /file\r\n", data, PRE_CWD, |
@@ -381,7 +381,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /file\r\n", data, PRE_CWD, |
@@ -409,7 +409,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_EPSV: |
return Verify("EPSV\r\n", data, PRE_PASV, |
@@ -434,7 +434,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /file\r\n", data, PRE_CWD, |
@@ -459,7 +459,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_CWD: |
return Verify("CWD /file\r\n", data, PRE_RETR, |
@@ -480,7 +480,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SYST: |
return Verify("SYST\r\n", data, PRE_PWD, "215 VMS\r\n"); |
@@ -518,7 +518,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE / !\"#$%y\200\201\r\n", data, PRE_CWD, |
@@ -546,7 +546,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_RETR: |
return Verify("RETR /file\r\n", data, PRE_QUIT, |
@@ -570,7 +570,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_LIST: |
return Verify("LIST\r\n", data, PRE_QUIT, |
@@ -595,7 +595,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
// Use unallocated 599 FTP error code to make sure it falls into the |
@@ -629,7 +629,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_EPSV: |
return Verify("EPSV\r\n", data, expected_state_, |
@@ -657,7 +657,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_PASV: |
return Verify("PASV\r\n", data, expected_state_, pasv_response_); |
@@ -682,7 +682,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_SIZE: |
return Verify("SIZE /file\r\n", data, expected_state_, size_response_); |
@@ -709,7 +709,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_USER: |
return Verify(std::string("USER ") + expected_user_ + "\r\n", data, |
@@ -736,7 +736,7 @@ |
virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { |
if (InjectFault()) |
- return MockWriteResult(true, data.length()); |
+ return MockWriteResult(ASYNC, data.length()); |
switch (state()) { |
case PRE_USER: |
return Verify("USER anonymous\r\n", data, |
@@ -772,7 +772,7 @@ |
MockRead data_reads[] = { |
// Usually FTP servers close the data connection after the entire data has |
// been received. |
- MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), |
+ MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), |
MockRead(mock_data.c_str()), |
}; |
StaticSocketDataProvider data_socket(data_reads, arraysize(data_reads), |
@@ -1187,7 +1187,7 @@ |
MockRead ctrl_reads[] = { |
MockRead("220 host TestFTPd\r\n"), |
MockRead("221 Goodbye!\r\n"), |
- MockRead(false, OK), |
+ MockRead(SYNCHRONOUS, OK), |
}; |
MockWrite ctrl_writes[] = { |
MockWrite("QUIT\r\n"), |
@@ -1222,7 +1222,7 @@ |
MockRead("220 host TestFTPd\r\n"), |
MockRead("331 User okay, send password\r\n"), |
MockRead("221 Goodbye!\r\n"), |
- MockRead(false, OK), |
+ MockRead(SYNCHRONOUS, OK), |
}; |
MockWrite ctrl_writes[] = { |
MockWrite("USER innocent\r\n"), |