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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/tcp_socket_unittest.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/tcp_socket_libevent.cc ('k') | net/socket/tcp_socket_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/tcp_socket_unittest.cc
diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc
index 198138860fc9d1a1df53ea2e7e3ae943c906cb49..a623bfbc117c28f923545486b0df0d19f9cabfb5 100644
--- a/net/socket/tcp_socket_unittest.cc
+++ b/net/socket/tcp_socket_unittest.cc
@@ -27,8 +27,7 @@ const int kListenBacklog = 5;
class TCPSocketTest : public PlatformTest {
protected:
- TCPSocketTest() : socket_(NULL, NetLog::Source()) {
- }
+ TCPSocketTest() : socket_(NULL, NetLog::Source()) {}
void SetUpListenIPv4() {
IPEndPoint address;
@@ -46,10 +45,9 @@ class TCPSocketTest : public PlatformTest {
ParseAddress("::1", 0, &address);
if (socket_.Open(ADDRESS_FAMILY_IPV6) != OK ||
- socket_.Bind(address) != OK ||
- socket_.Listen(kListenBacklog) != OK) {
+ socket_.Bind(address) != OK || socket_.Listen(kListenBacklog) != OK) {
LOG(ERROR) << "Failed to listen on ::1 - probably because IPv6 is "
- "disabled. Skipping the test";
+ "disabled. Skipping the test";
return;
}
ASSERT_EQ(OK, socket_.GetLocalAddress(&local_address_));
@@ -68,13 +66,14 @@ class TCPSocketTest : public PlatformTest {
TestCompletionCallback accept_callback;
scoped_ptr<TCPSocket> accepted_socket;
IPEndPoint accepted_address;
- ASSERT_EQ(ERR_IO_PENDING,
- socket_.Accept(&accepted_socket, &accepted_address,
- accept_callback.callback()));
+ ASSERT_EQ(
+ ERR_IO_PENDING,
+ socket_.Accept(
+ &accepted_socket, &accepted_address, accept_callback.callback()));
TestCompletionCallback connect_callback;
- TCPClientSocket connecting_socket(local_address_list(),
- NULL, NetLog::Source());
+ TCPClientSocket connecting_socket(
+ local_address_list(), NULL, NetLog::Source());
connecting_socket.Connect(connect_callback.callback());
EXPECT_EQ(OK, connect_callback.WaitForResult());
@@ -86,9 +85,7 @@ class TCPSocketTest : public PlatformTest {
EXPECT_EQ(accepted_address.address(), local_address_.address());
}
- AddressList local_address_list() const {
- return AddressList(local_address_);
- }
+ AddressList local_address_list() const { return AddressList(local_address_); }
TCPSocket socket_;
IPEndPoint local_address_;
@@ -101,15 +98,15 @@ TEST_F(TCPSocketTest, Accept) {
TestCompletionCallback connect_callback;
// TODO(yzshen): Switch to use TCPSocket when it supports client socket
// operations.
- TCPClientSocket connecting_socket(local_address_list(),
- NULL, NetLog::Source());
+ TCPClientSocket connecting_socket(
+ local_address_list(), NULL, NetLog::Source());
connecting_socket.Connect(connect_callback.callback());
TestCompletionCallback accept_callback;
scoped_ptr<TCPSocket> accepted_socket;
IPEndPoint accepted_address;
- int result = socket_.Accept(&accepted_socket, &accepted_address,
- accept_callback.callback());
+ int result = socket_.Accept(
+ &accepted_socket, &accepted_address, accept_callback.callback());
if (result == ERR_IO_PENDING)
result = accept_callback.WaitForResult();
ASSERT_EQ(OK, result);
@@ -156,18 +153,19 @@ TEST_F(TCPSocketTest, Accept2Connections) {
scoped_ptr<TCPSocket> accepted_socket;
IPEndPoint accepted_address;
- ASSERT_EQ(ERR_IO_PENDING,
- socket_.Accept(&accepted_socket, &accepted_address,
- accept_callback.callback()));
+ ASSERT_EQ(
+ ERR_IO_PENDING,
+ socket_.Accept(
+ &accepted_socket, &accepted_address, accept_callback.callback()));
TestCompletionCallback connect_callback;
- TCPClientSocket connecting_socket(local_address_list(),
- NULL, NetLog::Source());
+ TCPClientSocket connecting_socket(
+ local_address_list(), NULL, NetLog::Source());
connecting_socket.Connect(connect_callback.callback());
TestCompletionCallback connect_callback2;
- TCPClientSocket connecting_socket2(local_address_list(),
- NULL, NetLog::Source());
+ TCPClientSocket connecting_socket2(
+ local_address_list(), NULL, NetLog::Source());
connecting_socket2.Connect(connect_callback2.callback());
EXPECT_EQ(OK, accept_callback.WaitForResult());
@@ -176,8 +174,8 @@ TEST_F(TCPSocketTest, Accept2Connections) {
scoped_ptr<TCPSocket> accepted_socket2;
IPEndPoint accepted_address2;
- int result = socket_.Accept(&accepted_socket2, &accepted_address2,
- accept_callback2.callback());
+ int result = socket_.Accept(
+ &accepted_socket2, &accepted_address2, accept_callback2.callback());
if (result == ERR_IO_PENDING)
result = accept_callback2.WaitForResult();
ASSERT_EQ(OK, result);
@@ -201,15 +199,15 @@ TEST_F(TCPSocketTest, AcceptIPv6) {
return;
TestCompletionCallback connect_callback;
- TCPClientSocket connecting_socket(local_address_list(),
- NULL, NetLog::Source());
+ TCPClientSocket connecting_socket(
+ local_address_list(), NULL, NetLog::Source());
connecting_socket.Connect(connect_callback.callback());
TestCompletionCallback accept_callback;
scoped_ptr<TCPSocket> accepted_socket;
IPEndPoint accepted_address;
- int result = socket_.Accept(&accepted_socket, &accepted_address,
- accept_callback.callback());
+ int result = socket_.Accept(
+ &accepted_socket, &accepted_address, accept_callback.callback());
if (result == ERR_IO_PENDING)
result = accept_callback.WaitForResult();
ASSERT_EQ(OK, result);
@@ -234,8 +232,8 @@ TEST_F(TCPSocketTest, ReadWrite) {
TestCompletionCallback accept_callback;
scoped_ptr<TCPSocket> accepted_socket;
IPEndPoint accepted_address;
- result = socket_.Accept(&accepted_socket, &accepted_address,
- accept_callback.callback());
+ result = socket_.Accept(
+ &accepted_socket, &accepted_address, accept_callback.callback());
ASSERT_EQ(OK, accept_callback.GetResult(result));
ASSERT_TRUE(accepted_socket.get());
@@ -252,7 +250,8 @@ TEST_F(TCPSocketTest, ReadWrite) {
while (bytes_written < message.size()) {
scoped_refptr<IOBufferWithSize> write_buffer(
new IOBufferWithSize(message.size() - bytes_written));
- memmove(write_buffer->data(), message.data() + bytes_written,
+ memmove(write_buffer->data(),
+ message.data() + bytes_written,
message.size() - bytes_written);
TestCompletionCallback write_callback;
« net/base/mime_util_unittest.cc ('K') | « net/socket/tcp_socket_libevent.cc ('k') | net/socket/tcp_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698