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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/socket_test_util.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
« net/base/mime_util_unittest.cc ('K') | « net/socket/socket_test_util.h ('k') | net/socket/socks5_client_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index be81e9aaf2b4ddfcadbc3a3c81db9e55bdf8ba89..0b45b8ac06536dac2130974252e9245247f30f7f 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -65,47 +65,32 @@ void DumpData(const char* data, int data_len) {
} else {
int i;
for (i = 0; i <= (data_len - 4); i += 4) {
- DVLOG(1) << pfx
- << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
+ DVLOG(1) << pfx << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
<< AsciifyHigh(data[i + 1]) << AsciifyLow(data[i + 1])
<< AsciifyHigh(data[i + 2]) << AsciifyLow(data[i + 2])
- << AsciifyHigh(data[i + 3]) << AsciifyLow(data[i + 3])
- << " '"
- << Asciify(data[i + 0])
- << Asciify(data[i + 1])
- << Asciify(data[i + 2])
- << Asciify(data[i + 3])
- << "'";
+ << AsciifyHigh(data[i + 3]) << AsciifyLow(data[i + 3]) << " '"
+ << Asciify(data[i + 0]) << Asciify(data[i + 1])
+ << Asciify(data[i + 2]) << Asciify(data[i + 3]) << "'";
pfx = " ";
}
// Take care of any 'trailing' bytes, if data_len was not a multiple of 4.
switch (data_len - i) {
case 3:
- DVLOG(1) << pfx
- << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
+ DVLOG(1) << pfx << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
<< AsciifyHigh(data[i + 1]) << AsciifyLow(data[i + 1])
<< AsciifyHigh(data[i + 2]) << AsciifyLow(data[i + 2])
- << " '"
- << Asciify(data[i + 0])
- << Asciify(data[i + 1])
- << Asciify(data[i + 2])
- << " '";
+ << " '" << Asciify(data[i + 0]) << Asciify(data[i + 1])
+ << Asciify(data[i + 2]) << " '";
break;
case 2:
- DVLOG(1) << pfx
- << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
+ DVLOG(1) << pfx << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
<< AsciifyHigh(data[i + 1]) << AsciifyLow(data[i + 1])
- << " '"
- << Asciify(data[i + 0])
- << Asciify(data[i + 1])
+ << " '" << Asciify(data[i + 0]) << Asciify(data[i + 1])
<< " '";
break;
case 1:
- DVLOG(1) << pfx
- << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
- << " '"
- << Asciify(data[i + 0])
- << " '";
+ DVLOG(1) << pfx << AsciifyHigh(data[i + 0]) << AsciifyLow(data[i + 0])
+ << " '" << Asciify(data[i + 0]) << " '";
break;
}
}
@@ -115,8 +100,7 @@ template <MockReadWriteType type>
void DumpMockReadWrite(const MockReadWrite<type>& r) {
if (logging::LOG_INFO < logging::GetMinLogLevel())
return;
- DVLOG(1) << "Async: " << (r.mode == ASYNC)
- << "\nResult: " << r.result;
+ DVLOG(1) << "Async: " << (r.mode == ASYNC) << "\nResult: " << r.result;
DumpData(r.data, r.data_len);
const char* stop = (r.sequence_number & MockRead::STOPLOOP) ? " (STOP)" : "";
DVLOG(1) << "Stage: " << (r.sequence_number & ~MockRead::STOPLOOP) << stop
@@ -137,13 +121,12 @@ MockConnect::MockConnect(IoMode io_mode, int r) : mode(io_mode), result(r) {
peer_addr = IPEndPoint(ip, 0);
}
-MockConnect::MockConnect(IoMode io_mode, int r, IPEndPoint addr) :
- mode(io_mode),
- result(r),
- peer_addr(addr) {
+MockConnect::MockConnect(IoMode io_mode, int r, IPEndPoint addr)
+ : mode(io_mode), result(r), peer_addr(addr) {
}
-MockConnect::~MockConnect() {}
+MockConnect::~MockConnect() {
+}
StaticSocketDataProvider::StaticSocketDataProvider()
: reads_(NULL),
@@ -166,7 +149,8 @@ StaticSocketDataProvider::StaticSocketDataProvider(MockRead* reads,
write_count_(writes_count) {
}
-StaticSocketDataProvider::~StaticSocketDataProvider() {}
+StaticSocketDataProvider::~StaticSocketDataProvider() {
+}
const MockRead& StaticSocketDataProvider::PeekRead() const {
CHECK(!at_read_eof());
@@ -236,11 +220,11 @@ void StaticSocketDataProvider::Reset() {
}
DynamicSocketDataProvider::DynamicSocketDataProvider()
- : short_read_limit_(0),
- allow_unconsumed_reads_(false) {
+ : short_read_limit_(0), allow_unconsumed_reads_(false) {
}
-DynamicSocketDataProvider::~DynamicSocketDataProvider() {}
+DynamicSocketDataProvider::~DynamicSocketDataProvider() {
+}
MockRead DynamicSocketDataProvider::GetNextRead() {
if (reads_.empty())
@@ -288,9 +272,11 @@ void SSLSocketDataProvider::SetNextProto(NextProto proto) {
next_proto = SSLClientSocket::NextProtoToString(proto);
}
-DelayedSocketData::DelayedSocketData(
- int write_delay, MockRead* reads, size_t reads_count,
- MockWrite* writes, size_t writes_count)
+DelayedSocketData::DelayedSocketData(int write_delay,
+ MockRead* reads,
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count)
: StaticSocketDataProvider(reads, reads_count, writes, writes_count),
write_delay_(write_delay),
read_in_progress_(false),
@@ -298,9 +284,12 @@ DelayedSocketData::DelayedSocketData(
DCHECK_GE(write_delay_, 0);
}
-DelayedSocketData::DelayedSocketData(
- const MockConnect& connect, int write_delay, MockRead* reads,
- size_t reads_count, MockWrite* writes, size_t writes_count)
+DelayedSocketData::DelayedSocketData(const MockConnect& connect,
+ int write_delay,
+ MockRead* reads,
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count)
: StaticSocketDataProvider(reads, reads_count, writes, writes_count),
write_delay_(write_delay),
read_in_progress_(false),
@@ -350,20 +339,27 @@ void DelayedSocketData::CompleteRead() {
socket()->OnReadComplete(GetNextRead());
}
-OrderedSocketData::OrderedSocketData(
- MockRead* reads, size_t reads_count, MockWrite* writes, size_t writes_count)
+OrderedSocketData::OrderedSocketData(MockRead* reads,
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count)
: StaticSocketDataProvider(reads, reads_count, writes, writes_count),
- sequence_number_(0), loop_stop_stage_(0),
- blocked_(false), weak_factory_(this) {
+ sequence_number_(0),
+ loop_stop_stage_(0),
+ blocked_(false),
+ weak_factory_(this) {
}
-OrderedSocketData::OrderedSocketData(
- const MockConnect& connect,
- MockRead* reads, size_t reads_count,
- MockWrite* writes, size_t writes_count)
+OrderedSocketData::OrderedSocketData(const MockConnect& connect,
+ MockRead* reads,
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count)
: StaticSocketDataProvider(reads, reads_count, writes, writes_count),
- sequence_number_(0), loop_stop_stage_(0),
- blocked_(false), weak_factory_(this) {
+ sequence_number_(0),
+ loop_stop_stage_(0),
+ blocked_(false),
+ weak_factory_(this) {
set_connect_data(connect);
}
@@ -373,8 +369,7 @@ void OrderedSocketData::EndLoop() {
NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": EndLoop()";
if (loop_stop_stage_ > 0) {
const MockRead& next_read = StaticSocketDataProvider::PeekRead();
- if ((next_read.sequence_number & ~MockRead::STOPLOOP) >
- loop_stop_stage_) {
+ if ((next_read.sequence_number & ~MockRead::STOPLOOP) > loop_stop_stage_) {
NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_
<< ": Clearing stop index";
loop_stop_stage_ = 0;
@@ -394,10 +389,9 @@ MockRead OrderedSocketData::GetNextRead() {
const MockRead& next_read = StaticSocketDataProvider::PeekRead();
if (next_read.sequence_number & MockRead::STOPLOOP)
EndLoop();
- if ((next_read.sequence_number & ~MockRead::STOPLOOP) <=
- sequence_number_++) {
- NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ - 1
- << ": Read " << read_index();
+ if ((next_read.sequence_number & ~MockRead::STOPLOOP) <= sequence_number_++) {
+ NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ - 1 << ": Read "
+ << read_index();
DumpMockReadWrite(next_read);
blocked_ = (next_read.result == ERR_IO_PENDING);
return StaticSocketDataProvider::GetNextRead();
@@ -411,8 +405,8 @@ MockRead OrderedSocketData::GetNextRead() {
}
MockWriteResult OrderedSocketData::OnWrite(const std::string& data) {
- NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_
- << ": Write " << write_index();
+ NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": Write "
+ << write_index();
DumpMockReadWrite(PeekWrite());
++sequence_number_;
if (blocked_) {
@@ -431,8 +425,7 @@ MockWriteResult OrderedSocketData::OnWrite(const std::string& data) {
}
void OrderedSocketData::Reset() {
- NET_TRACE(INFO, " *** ") << "Stage "
- << sequence_number_ << ": Reset()";
+ NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": Reset()";
sequence_number_ = 0;
loop_stop_stage_ = 0;
set_socket(NULL);
@@ -447,10 +440,13 @@ void OrderedSocketData::CompleteRead() {
}
}
-OrderedSocketData::~OrderedSocketData() {}
+OrderedSocketData::~OrderedSocketData() {
+}
DeterministicSocketData::DeterministicSocketData(MockRead* reads,
- size_t reads_count, MockWrite* writes, size_t writes_count)
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count)
: StaticSocketDataProvider(reads, reads_count, writes, writes_count),
sequence_number_(0),
current_read_(),
@@ -462,7 +458,8 @@ DeterministicSocketData::DeterministicSocketData(MockRead* reads,
VerifyCorrectSequenceNumbers(reads, reads_count, writes, writes_count);
}
-DeterministicSocketData::~DeterministicSocketData() {}
+DeterministicSocketData::~DeterministicSocketData() {
+}
void DeterministicSocketData::Run() {
DCHECK(!is_running_);
@@ -526,8 +523,8 @@ MockRead DeterministicSocketData::GetNextRead() {
MockRead result = MockRead(SYNCHRONOUS, ERR_IO_PENDING);
if (current_read_.mode == SYNCHRONOUS) {
LOG(ERROR) << "Unable to perform synchronous read: "
- << current_read_.sequence_number
- << " at stage: " << sequence_number_;
+ << current_read_.sequence_number
+ << " at stage: " << sequence_number_;
result = MockRead(SYNCHRONOUS, ERR_UNEXPECTED);
}
if (print_debug_)
@@ -535,8 +532,8 @@ MockRead DeterministicSocketData::GetNextRead() {
return result;
}
- NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_
- << ": Read " << read_index();
+ NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": Read "
+ << read_index();
if (print_debug_)
DumpMockReadWrite(current_read_);
@@ -566,12 +563,13 @@ MockWriteResult DeterministicSocketData::OnWrite(const std::string& data) {
<< ": I/O Pending";
if (next_write.mode == SYNCHRONOUS) {
LOG(ERROR) << "Unable to perform synchronous write: "
- << next_write.sequence_number << " at stage: " << sequence_number_;
+ << next_write.sequence_number
+ << " at stage: " << sequence_number_;
return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED);
}
} else {
- NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_
- << ": Write " << write_index();
+ NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": Write "
+ << write_index();
}
if (print_debug_)
@@ -587,8 +585,7 @@ MockWriteResult DeterministicSocketData::OnWrite(const std::string& data) {
}
void DeterministicSocketData::Reset() {
- NET_TRACE(INFO, " *** ") << "Stage "
- << sequence_number_ << ": Reset()";
+ NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": Reset()";
sequence_number_ = 0;
StaticSocketDataProvider::Reset();
NOTREACHED();
@@ -618,15 +615,17 @@ void DeterministicSocketData::NextStep() {
}
void DeterministicSocketData::VerifyCorrectSequenceNumbers(
- MockRead* reads, size_t reads_count,
- MockWrite* writes, size_t writes_count) {
+ MockRead* reads,
+ size_t reads_count,
+ MockWrite* writes,
+ size_t writes_count) {
size_t read = 0;
size_t write = 0;
int expected = 0;
while (read < reads_count || write < writes_count) {
// Check to see that we have a read or write at the expected
// state.
- if (read < reads_count && reads[read].sequence_number == expected) {
+ if (read < reads_count && reads[read].sequence_number == expected) {
++read;
++expected;
continue;
@@ -643,12 +642,13 @@ void DeterministicSocketData::VerifyCorrectSequenceNumbers(
DCHECK_EQ(write, writes_count);
}
-MockClientSocketFactory::MockClientSocketFactory() {}
+MockClientSocketFactory::MockClientSocketFactory() {
+}
-MockClientSocketFactory::~MockClientSocketFactory() {}
+MockClientSocketFactory::~MockClientSocketFactory() {
+}
-void MockClientSocketFactory::AddSocketDataProvider(
- SocketDataProvider* data) {
+void MockClientSocketFactory::AddSocketDataProvider(SocketDataProvider* data) {
mock_data_.Add(data);
}
@@ -695,7 +695,8 @@ scoped_ptr<SSLClientSocket> MockClientSocketFactory::CreateSSLClientSocket(
const SSLClientSocketContext& context) {
return scoped_ptr<SSLClientSocket>(
new MockSSLClientSocket(transport_socket.Pass(),
- host_and_port, ssl_config,
+ host_and_port,
+ ssl_config,
mock_ssl_data_.GetNext()));
}
@@ -705,9 +706,7 @@ void MockClientSocketFactory::ClearSSLSessionCache() {
const char MockClientSocket::kTlsUnique[] = "MOCK_TLSUNIQ";
MockClientSocket::MockClientSocket(const BoundNetLog& net_log)
- : connected_(false),
- net_log_(net_log),
- weak_factory_(this) {
+ : connected_(false), net_log_(net_log), weak_factory_(this) {
IPAddressNumber ip;
CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip));
peer_addr_ = IPEndPoint(ip, 0);
@@ -753,7 +752,7 @@ const BoundNetLog& MockClientSocket::NetLog() const {
}
void MockClientSocket::GetSSLCertRequestInfo(
- SSLCertRequestInfo* cert_request_info) {
+ SSLCertRequestInfo* cert_request_info) {
}
int MockClientSocket::ExportKeyingMaterial(const base::StringPiece& label,
@@ -775,8 +774,9 @@ ServerBoundCertService* MockClientSocket::GetServerBoundCertService() const {
return NULL;
}
-SSLClientSocket::NextProtoStatus
-MockClientSocket::GetNextProto(std::string* proto, std::string* server_protos) {
+SSLClientSocket::NextProtoStatus MockClientSocket::GetNextProto(
+ std::string* proto,
+ std::string* server_protos) {
proto->clear();
server_protos->clear();
return SSLClientSocket::kNextProtoUnsupported;
@@ -788,7 +788,8 @@ MockClientSocket::GetUnverifiedServerCertificateChain() const {
return NULL;
}
-MockClientSocket::~MockClientSocket() {}
+MockClientSocket::~MockClientSocket() {
+}
void MockClientSocket::RunCallbackAsync(const CompletionCallback& callback,
int result) {
@@ -824,9 +825,11 @@ MockTCPClientSocket::MockTCPClientSocket(const AddressList& addresses,
data_->Reset();
}
-MockTCPClientSocket::~MockTCPClientSocket() {}
+MockTCPClientSocket::~MockTCPClientSocket() {
+}
-int MockTCPClientSocket::Read(IOBuffer* buf, int buf_len,
+int MockTCPClientSocket::Read(IOBuffer* buf,
+ int buf_len,
const CompletionCallback& callback) {
if (!connected_)
return ERR_UNEXPECTED;
@@ -865,7 +868,8 @@ int MockTCPClientSocket::Read(IOBuffer* buf, int buf_len,
return CompleteRead();
}
-int MockTCPClientSocket::Write(IOBuffer* buf, int buf_len,
+int MockTCPClientSocket::Write(IOBuffer* buf,
+ int buf_len,
const CompletionCallback& callback) {
DCHECK(buf);
DCHECK_GT(buf_len, 0);
@@ -1017,7 +1021,8 @@ DeterministicSocketHelper::DeterministicSocketHelper(
net_log_(BoundNetLog::Make(net_log, net::NetLog::SOURCE_NONE)) {
}
-DeterministicSocketHelper::~DeterministicSocketHelper() {}
+DeterministicSocketHelper::~DeterministicSocketHelper() {
+}
void DeterministicSocketHelper::CompleteWrite() {
was_used_to_convey_data_ = true;
@@ -1053,8 +1058,9 @@ int DeterministicSocketHelper::CompleteRead() {
return result;
}
-int DeterministicSocketHelper::Write(
- IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
+int DeterministicSocketHelper::Write(IOBuffer* buf,
+ int buf_len,
+ const CompletionCallback& callback) {
DCHECK(buf);
DCHECK_GT(buf_len, 0);
@@ -1074,9 +1080,9 @@ int DeterministicSocketHelper::Write(
return write_result.result;
}
-int DeterministicSocketHelper::Read(
- IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
-
+int DeterministicSocketHelper::Read(IOBuffer* buf,
+ int buf_len,
+ const CompletionCallback& callback) {
read_data_ = data_->GetNextRead();
// The buffer should always be big enough to contain all the MockRead data. To
// use small buffers, split the data into multiple MockReads.
@@ -1111,12 +1117,11 @@ int DeterministicSocketHelper::Read(
DeterministicMockUDPClientSocket::DeterministicMockUDPClientSocket(
net::NetLog* net_log,
DeterministicSocketData* data)
- : connected_(false),
- helper_(net_log, data),
- source_port_(123) {
+ : connected_(false), helper_(net_log, data), source_port_(123) {
}
-DeterministicMockUDPClientSocket::~DeterministicMockUDPClientSocket() {}
+DeterministicMockUDPClientSocket::~DeterministicMockUDPClientSocket() {
+}
bool DeterministicMockUDPClientSocket::WritePending() const {
return helper_.write_pending();
@@ -1152,10 +1157,9 @@ int DeterministicMockUDPClientSocket::Write(
return helper_.Write(buf, buf_len, callback);
}
-int DeterministicMockUDPClientSocket::Read(
- IOBuffer* buf,
- int buf_len,
- const CompletionCallback& callback) {
+int DeterministicMockUDPClientSocket::Read(IOBuffer* buf,
+ int buf_len,
+ const CompletionCallback& callback) {
if (!connected_)
return ERR_UNEXPECTED;
@@ -1193,7 +1197,8 @@ const BoundNetLog& DeterministicMockUDPClientSocket::NetLog() const {
return helper_.net_log();
}
-void DeterministicMockUDPClientSocket::OnReadComplete(const MockRead& data) {}
+void DeterministicMockUDPClientSocket::OnReadComplete(const MockRead& data) {
+}
void DeterministicMockUDPClientSocket::OnConnectComplete(
const MockConnect& data) {
@@ -1208,7 +1213,8 @@ DeterministicMockTCPClientSocket::DeterministicMockTCPClientSocket(
peer_addr_ = data->connect_data().peer_addr;
}
-DeterministicMockTCPClientSocket::~DeterministicMockTCPClientSocket() {}
+DeterministicMockTCPClientSocket::~DeterministicMockTCPClientSocket() {
+}
bool DeterministicMockTCPClientSocket::WritePending() const {
return helper_.write_pending();
@@ -1236,10 +1242,9 @@ int DeterministicMockTCPClientSocket::Write(
return helper_.Write(buf, buf_len, callback);
}
-int DeterministicMockTCPClientSocket::Read(
- IOBuffer* buf,
- int buf_len,
- const CompletionCallback& callback) {
+int DeterministicMockTCPClientSocket::Read(IOBuffer* buf,
+ int buf_len,
+ const CompletionCallback& callback) {
if (!connected_)
return ERR_UNEXPECTED;
@@ -1287,10 +1292,12 @@ bool DeterministicMockTCPClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
return false;
}
-void DeterministicMockTCPClientSocket::OnReadComplete(const MockRead& data) {}
+void DeterministicMockTCPClientSocket::OnReadComplete(const MockRead& data) {
+}
void DeterministicMockTCPClientSocket::OnConnectComplete(
- const MockConnect& data) {}
+ const MockConnect& data) {
+}
// static
void MockSSLClientSocket::ConnectCallback(
@@ -1308,9 +1315,9 @@ MockSSLClientSocket::MockSSLClientSocket(
const SSLConfig& ssl_config,
SSLSocketDataProvider* data)
: MockClientSocket(
- // Have to use the right BoundNetLog for LoadTimingInfo regression
- // tests.
- transport_socket->socket()->NetLog()),
+ // Have to use the right BoundNetLog for LoadTimingInfo regression
+ // tests.
+ transport_socket->socket()->NetLog()),
transport_(transport_socket.Pass()),
data_(data),
is_npn_state_set_(false),
@@ -1325,12 +1332,14 @@ MockSSLClientSocket::~MockSSLClientSocket() {
Disconnect();
}
-int MockSSLClientSocket::Read(IOBuffer* buf, int buf_len,
+int MockSSLClientSocket::Read(IOBuffer* buf,
+ int buf_len,
const CompletionCallback& callback) {
return transport_->socket()->Read(buf, buf_len, callback);
}
-int MockSSLClientSocket::Write(IOBuffer* buf, int buf_len,
+int MockSSLClientSocket::Write(IOBuffer* buf,
+ int buf_len,
const CompletionCallback& callback) {
return transport_->socket()->Write(buf, buf_len, callback);
}
@@ -1384,8 +1393,7 @@ void MockSSLClientSocket::GetSSLCertRequestInfo(
SSLCertRequestInfo* cert_request_info) {
DCHECK(cert_request_info);
if (data_->cert_request_info) {
- cert_request_info->host_and_port =
- data_->cert_request_info->host_and_port;
+ cert_request_info->host_and_port = data_->cert_request_info->host_and_port;
cert_request_info->client_certs = data_->cert_request_info->client_certs;
} else {
cert_request_info->Reset();
@@ -1393,7 +1401,8 @@ void MockSSLClientSocket::GetSSLCertRequestInfo(
}
SSLClientSocket::NextProtoStatus MockSSLClientSocket::GetNextProto(
- std::string* proto, std::string* server_protos) {
+ std::string* proto,
+ std::string* server_protos) {
*proto = data_->next_proto;
*server_protos = data_->server_protos;
return data_->next_proto_status;
@@ -1459,7 +1468,8 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data,
peer_addr_ = data->connect_data().peer_addr;
}
-MockUDPClientSocket::~MockUDPClientSocket() {}
+MockUDPClientSocket::~MockUDPClientSocket() {
+}
int MockUDPClientSocket::Read(IOBuffer* buf,
int buf_len,
@@ -1490,7 +1500,8 @@ int MockUDPClientSocket::Read(IOBuffer* buf,
return CompleteRead();
}
-int MockUDPClientSocket::Write(IOBuffer* buf, int buf_len,
+int MockUDPClientSocket::Write(IOBuffer* buf,
+ int buf_len,
const CompletionCallback& callback) {
DCHECK(buf);
DCHECK_GT(buf_len, 0);
@@ -1621,11 +1632,12 @@ void MockUDPClientSocket::RunCallback(const CompletionCallback& callback,
}
TestSocketRequest::TestSocketRequest(
- std::vector<TestSocketRequest*>* request_order, size_t* completion_count)
+ std::vector<TestSocketRequest*>* request_order,
+ size_t* completion_count)
: request_order_(request_order),
completion_count_(completion_count),
- callback_(base::Bind(&TestSocketRequest::OnComplete,
- base::Unretained(this))) {
+ callback_(
+ base::Bind(&TestSocketRequest::OnComplete, base::Unretained(this))) {
DCHECK(request_order);
DCHECK(completion_count);
}
@@ -1645,8 +1657,10 @@ const int ClientSocketPoolTest::kIndexOutOfBounds = -1;
// static
const int ClientSocketPoolTest::kRequestNotFound = -2;
-ClientSocketPoolTest::ClientSocketPoolTest() : completion_count_(0) {}
-ClientSocketPoolTest::~ClientSocketPoolTest() {}
+ClientSocketPoolTest::ClientSocketPoolTest() : completion_count_(0) {
+}
+ClientSocketPoolTest::~ClientSocketPoolTest() {
+}
int ClientSocketPoolTest::GetOrderOfRequest(size_t index) const {
index--;
@@ -1685,16 +1699,15 @@ MockTransportClientSocketPool::MockConnectJob::MockConnectJob(
scoped_ptr<StreamSocket> socket,
ClientSocketHandle* handle,
const CompletionCallback& callback)
- : socket_(socket.Pass()),
- handle_(handle),
- user_callback_(callback) {
+ : socket_(socket.Pass()), handle_(handle), user_callback_(callback) {
}
-MockTransportClientSocketPool::MockConnectJob::~MockConnectJob() {}
+MockTransportClientSocketPool::MockConnectJob::~MockConnectJob() {
+}
int MockTransportClientSocketPool::MockConnectJob::Connect() {
- int rv = socket_->Connect(base::Bind(&MockConnectJob::OnConnect,
- base::Unretained(this)));
+ int rv = socket_->Connect(
+ base::Bind(&MockConnectJob::OnConnect, base::Unretained(this)));
if (rv == OK) {
user_callback_.Reset();
OnConnect(OK);
@@ -1745,20 +1758,28 @@ MockTransportClientSocketPool::MockTransportClientSocketPool(
int max_sockets_per_group,
ClientSocketPoolHistograms* histograms,
ClientSocketFactory* socket_factory)
- : TransportClientSocketPool(max_sockets, max_sockets_per_group, histograms,
- NULL, NULL, NULL),
+ : TransportClientSocketPool(max_sockets,
+ max_sockets_per_group,
+ histograms,
+ NULL,
+ NULL,
+ NULL),
client_socket_factory_(socket_factory),
last_request_priority_(DEFAULT_PRIORITY),
release_count_(0),
cancel_count_(0) {
}
-MockTransportClientSocketPool::~MockTransportClientSocketPool() {}
+MockTransportClientSocketPool::~MockTransportClientSocketPool() {
+}
int MockTransportClientSocketPool::RequestSocket(
- const std::string& group_name, const void* socket_params,
- RequestPriority priority, ClientSocketHandle* handle,
- const CompletionCallback& callback, const BoundNetLog& net_log) {
+ const std::string& group_name,
+ const void* socket_params,
+ RequestPriority priority,
+ ClientSocketHandle* handle,
+ const CompletionCallback& callback,
+ const BoundNetLog& net_log) {
last_request_priority_ = priority;
scoped_ptr<StreamSocket> socket =
client_socket_factory_->CreateTransportClientSocket(
@@ -1788,9 +1809,11 @@ void MockTransportClientSocketPool::ReleaseSocket(
release_count_++;
}
-DeterministicMockClientSocketFactory::DeterministicMockClientSocketFactory() {}
+DeterministicMockClientSocketFactory::DeterministicMockClientSocketFactory() {
+}
-DeterministicMockClientSocketFactory::~DeterministicMockClientSocketFactory() {}
+DeterministicMockClientSocketFactory::~DeterministicMockClientSocketFactory() {
+}
void DeterministicMockClientSocketFactory::AddSocketDataProvider(
DeterministicSocketData* data) {
@@ -1807,8 +1830,9 @@ void DeterministicMockClientSocketFactory::ResetNextMockIndexes() {
mock_ssl_data_.ResetNextIndex();
}
-MockSSLClientSocket* DeterministicMockClientSocketFactory::
- GetMockSSLClientSocket(size_t index) const {
+MockSSLClientSocket*
+DeterministicMockClientSocketFactory::GetMockSSLClientSocket(
+ size_t index) const {
DCHECK_LT(index, ssl_client_sockets_.size());
return ssl_client_sockets_[index];
}
@@ -1850,7 +1874,8 @@ DeterministicMockClientSocketFactory::CreateSSLClientSocket(
const SSLClientSocketContext& context) {
scoped_ptr<MockSSLClientSocket> socket(
new MockSSLClientSocket(transport_socket.Pass(),
- host_and_port, ssl_config,
+ host_and_port,
+ ssl_config,
mock_ssl_data_.GetNext()));
ssl_client_sockets_.push_back(socket.get());
return socket.PassAs<SSLClientSocket>();
@@ -1864,24 +1889,30 @@ MockSOCKSClientSocketPool::MockSOCKSClientSocketPool(
int max_sockets_per_group,
ClientSocketPoolHistograms* histograms,
TransportClientSocketPool* transport_pool)
- : SOCKSClientSocketPool(max_sockets, max_sockets_per_group, histograms,
- NULL, transport_pool, NULL),
+ : SOCKSClientSocketPool(max_sockets,
+ max_sockets_per_group,
+ histograms,
+ NULL,
+ transport_pool,
+ NULL),
transport_pool_(transport_pool) {
}
-MockSOCKSClientSocketPool::~MockSOCKSClientSocketPool() {}
+MockSOCKSClientSocketPool::~MockSOCKSClientSocketPool() {
+}
-int MockSOCKSClientSocketPool::RequestSocket(
- const std::string& group_name, const void* socket_params,
- RequestPriority priority, ClientSocketHandle* handle,
- const CompletionCallback& callback, const BoundNetLog& net_log) {
+int MockSOCKSClientSocketPool::RequestSocket(const std::string& group_name,
+ const void* socket_params,
+ RequestPriority priority,
+ ClientSocketHandle* handle,
+ const CompletionCallback& callback,
+ const BoundNetLog& net_log) {
return transport_pool_->RequestSocket(
group_name, socket_params, priority, handle, callback, net_log);
}
-void MockSOCKSClientSocketPool::CancelRequest(
- const std::string& group_name,
- ClientSocketHandle* handle) {
+void MockSOCKSClientSocketPool::CancelRequest(const std::string& group_name,
+ ClientSocketHandle* handle) {
return transport_pool_->CancelRequest(group_name, handle);
}
@@ -1891,18 +1922,18 @@ void MockSOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
return transport_pool_->ReleaseSocket(group_name, socket.Pass(), id);
}
-const char kSOCKS5GreetRequest[] = { 0x05, 0x01, 0x00 };
+const char kSOCKS5GreetRequest[] = {0x05, 0x01, 0x00};
const int kSOCKS5GreetRequestLength = arraysize(kSOCKS5GreetRequest);
-const char kSOCKS5GreetResponse[] = { 0x05, 0x00 };
+const char kSOCKS5GreetResponse[] = {0x05, 0x00};
const int kSOCKS5GreetResponseLength = arraysize(kSOCKS5GreetResponse);
-const char kSOCKS5OkRequest[] =
- { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
+const char kSOCKS5OkRequest[] = {0x05, 0x01, 0x00, 0x03, 0x04, 'h',
+ 'o', 's', 't', 0x00, 0x50};
const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
-const char kSOCKS5OkResponse[] =
- { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
+const char kSOCKS5OkResponse[] = {0x05, 0x00, 0x00, 0x01, 127,
+ 0, 0, 1, 0x00, 0x50};
const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
} // namespace net
« net/base/mime_util_unittest.cc ('K') | « net/socket/socket_test_util.h ('k') | net/socket/socks5_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698