| Index: net/socket/tcp_server_socket_unittest.cc
|
| diff --git a/net/socket/tcp_server_socket_unittest.cc b/net/socket/tcp_server_socket_unittest.cc
|
| index fd81e550d080579f2b623e410b5622229db0bfd8..e338d149dcc50920a9b5b083207abdb13b7a18dc 100644
|
| --- a/net/socket/tcp_server_socket_unittest.cc
|
| +++ b/net/socket/tcp_server_socket_unittest.cc
|
| @@ -26,9 +26,7 @@ const int kListenBacklog = 5;
|
|
|
| class TCPServerSocketTest : public PlatformTest {
|
| protected:
|
| - TCPServerSocketTest()
|
| - : socket_(NULL, NetLog::Source()) {
|
| - }
|
| + TCPServerSocketTest() : socket_(NULL, NetLog::Source()) {}
|
|
|
| void SetUpIPv4() {
|
| IPEndPoint address;
|
| @@ -43,7 +41,7 @@ class TCPServerSocketTest : public PlatformTest {
|
| ParseAddress("::1", 0, &address);
|
| if (socket_.Listen(address, kListenBacklog) != 0) {
|
| 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_));
|
| @@ -64,9 +62,7 @@ class TCPServerSocketTest : public PlatformTest {
|
| return address;
|
| }
|
|
|
| - AddressList local_address_list() const {
|
| - return AddressList(local_address_);
|
| - }
|
| + AddressList local_address_list() const { return AddressList(local_address_); }
|
|
|
| TCPServerSocket socket_;
|
| IPEndPoint local_address_;
|
| @@ -76,8 +72,8 @@ TEST_F(TCPServerSocketTest, Accept) {
|
| ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
|
|
|
| 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;
|
| @@ -107,8 +103,8 @@ TEST_F(TCPServerSocketTest, AcceptAsync) {
|
| socket_.Accept(&accepted_socket, 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());
|
| @@ -132,13 +128,13 @@ TEST_F(TCPServerSocketTest, Accept2Connections) {
|
| socket_.Accept(&accepted_socket, 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());
|
| @@ -169,8 +165,8 @@ TEST_F(TCPServerSocketTest, 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;
|
| @@ -193,8 +189,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) {
|
| ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
|
|
|
| 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;
|
|
|