net/socket/tcp_server_socket_unittest.cc - Issue 2333923004: Extracting NetLog inner classes into their own classes.

Unified Diff: net/socket/tcp_server_socket_unittest.cc

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)

Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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

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 c6a29e3503002ba72a3ae74e394de1efacc4485e..2f7ea3808ae59a422449c2d05f414401398930cd 100644

--- a/net/socket/tcp_server_socket_unittest.cc

+++ b/net/socket/tcp_server_socket_unittest.cc

@@ -16,6 +16,7 @@

#include "net/base/ip_endpoint.h"

#include "net/base/net_errors.h"

#include "net/base/test_completion_callback.h"

+#include "net/log/net_log_source.h"

#include "net/socket/tcp_client_socket.h"

#include "net/test/gtest_util.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -31,9 +32,7 @@ const int kListenBacklog = 5;

class TCPServerSocketTest : public PlatformTest {

protected:

- TCPServerSocketTest()

- : socket_(NULL, NetLog::Source()) {

- }

+ TCPServerSocketTest() : socket_(NULL, NetLogSource()) {}

void SetUpIPv4() {

IPEndPoint address(IPAddress::IPv4Localhost(), 0);

@@ -72,7 +71,7 @@ TEST_F(TCPServerSocketTest, Accept) {

TestCompletionCallback connect_callback;

TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

- NetLog::Source());

+ NetLogSource());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback accept_callback;

@@ -103,7 +102,7 @@ TEST_F(TCPServerSocketTest, AcceptAsync) {

TestCompletionCallback connect_callback;

TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

- NetLog::Source());

+ NetLogSource());

connecting_socket.Connect(connect_callback.callback());

EXPECT_THAT(connect_callback.WaitForResult(), IsOk());

@@ -128,12 +127,12 @@ TEST_F(TCPServerSocketTest, Accept2Connections) {

TestCompletionCallback connect_callback;

TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

- NetLog::Source());

+ NetLogSource());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback connect_callback2;

TCPClientSocket connecting_socket2(local_address_list(), NULL, NULL,

- NetLog::Source());

+ NetLogSource());

connecting_socket2.Connect(connect_callback2.callback());

EXPECT_THAT(accept_callback.WaitForResult(), IsOk());

@@ -165,7 +164,7 @@ TEST_F(TCPServerSocketTest, AcceptIPv6) {

TestCompletionCallback connect_callback;

TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

- NetLog::Source());

+ NetLogSource());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback accept_callback;

@@ -189,7 +188,7 @@ TEST_F(TCPServerSocketTest, AcceptIO) {

TestCompletionCallback connect_callback;

TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

- NetLog::Source());

+ NetLogSource());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback accept_callback;

« chrome/browser/extensions/api/log_private/log_private_api.h ('K') | « net/socket/tcp_server_socket.cc ('k') | net/socket/tcp_socket_posix.h » ('j') | no next file with comments »