Index: net/socket/socket_test_util.h |
=================================================================== |
--- net/socket/socket_test_util.h (revision 122608) |
+++ net/socket/socket_test_util.h (working copy) |
@@ -53,17 +53,17 @@ |
class SSLHostInfo; |
class StreamSocket; |
-enum ConnectMode { |
+enum IoMode { |
ASYNC, |
SYNCHRONOUS |
}; |
struct MockConnect { |
// Asynchronous connection success. |
- MockConnect() : async(true), result(OK) { } |
- MockConnect(ConnectMode m, int r) : async(m == ASYNC), result(r) { } |
+ MockConnect() : mode(ASYNC), result(OK) { } |
+ MockConnect(IoMode m, int r) : mode(m), result(r) { } |
- bool async; |
+ IoMode mode; |
int result; |
}; |
@@ -74,44 +74,45 @@ |
}; |
// Default |
- MockRead() : async(false), result(0), data(NULL), data_len(0), |
+ MockRead() : mode(SYNCHRONOUS), result(0), data(NULL), data_len(0), |
sequence_number(0), time_stamp(base::Time::Now()) {} |
// Read failure (no data). |
- MockRead(bool async, int result) : async(async) , result(result), data(NULL), |
- data_len(0), sequence_number(0), time_stamp(base::Time::Now()) { } |
+ MockRead(IoMode m, int result) : mode(m), result(result), |
jar (doing other things)
2012/02/22 17:38:25
Style guide would probably argue against using "m"
Ryan Hamilton
2012/02/22 17:50:10
Done.
|
+ data(NULL), data_len(0), sequence_number(0), |
+ time_stamp(base::Time::Now()) { } |
// Read failure (no data), with sequence information. |
- MockRead(bool async, int result, int seq) : async(async) , result(result), |
- data(NULL), data_len(0), sequence_number(seq), |
+ MockRead(IoMode m, int result, int seq) : mode(m), |
+ result(result), data(NULL), data_len(0), sequence_number(seq), |
time_stamp(base::Time::Now()) { } |
// Asynchronous read success (inferred data length). |
- explicit MockRead(const char* data) : async(true), result(0), data(data), |
+ explicit MockRead(const char* data) : mode(ASYNC), result(0), data(data), |
data_len(strlen(data)), sequence_number(0), |
time_stamp(base::Time::Now()) { } |
// Read success (inferred data length). |
- MockRead(bool async, const char* data) : async(async), result(0), data(data), |
- data_len(strlen(data)), sequence_number(0), |
+ MockRead(IoMode m, const char* data) : mode(m), result(0), |
+ data(data), data_len(strlen(data)), sequence_number(0), |
time_stamp(base::Time::Now()) { } |
// Read success. |
- MockRead(bool async, const char* data, int data_len) : async(async), |
+ MockRead(IoMode m, const char* data, int data_len) : mode(m), |
result(0), data(data), data_len(data_len), sequence_number(0), |
time_stamp(base::Time::Now()) { } |
// Read success (inferred data length) with sequence information. |
- MockRead(bool async, int seq, const char* data) : async(async), |
+ MockRead(IoMode m, int seq, const char* data) : mode(m), |
result(0), data(data), data_len(strlen(data)), sequence_number(seq), |
time_stamp(base::Time::Now()) { } |
// Read success with sequence information. |
- MockRead(bool async, const char* data, int data_len, int seq) : async(async), |
- result(0), data(data), data_len(data_len), sequence_number(seq), |
- time_stamp(base::Time::Now()) { } |
+ MockRead(IoMode m, const char* data, int data_len, int seq) : |
+ mode(m), result(0), data(data), data_len(data_len), |
+ sequence_number(seq), time_stamp(base::Time::Now()) { } |
- bool async; |
+ IoMode mode; |
int result; |
const char* data; |
int data_len; |
@@ -131,9 +132,9 @@ |
typedef MockRead MockWrite; |
struct MockWriteResult { |
- MockWriteResult(bool async, int result) : async(async), result(result) {} |
+ MockWriteResult(IoMode m, int result) : mode(m), result(result) {} |
- bool async; |
+ IoMode mode; |
int result; |
}; |
@@ -263,7 +264,7 @@ |
// SSLSocketDataProviders only need to keep track of the return code from calls |
// to Connect(). |
struct SSLSocketDataProvider { |
- SSLSocketDataProvider(bool async, int result); |
+ SSLSocketDataProvider(IoMode mode, int result); |
~SSLSocketDataProvider(); |
MockConnect connect; |