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

Unified Diff: net/server/http_server_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/server/http_server_unittest.cc
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
index f0b269ff943aadd6c13f7f06e7cba637bcc117fe..87c2784da62ec2304b20983b4841f28d3725765d 100644
--- a/net/server/http_server_unittest.cc
+++ b/net/server/http_server_unittest.cc
@@ -36,7 +36,8 @@
#include "net/base/test_completion_callback.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
-#include "net/log/net_log.h"
+#include "net/log/net_log_source.h"
+#include "net/log/net_log_with_source.h"
#include "net/server/http_server_request_info.h"
#include "net/socket/tcp_client_socket.h"
#include "net/socket/tcp_server_socket.h"
@@ -83,7 +84,7 @@ class TestHttpClient {
int ConnectAndWait(const IPEndPoint& address) {
AddressList addresses(address);
- NetLog::Source source;
+ NetLogSource source;
socket_.reset(new TCPClientSocket(addresses, NULL, NULL, source));
base::RunLoop run_loop;
@@ -194,7 +195,7 @@ class HttpServerTest : public testing::Test,
void SetUp() override {
std::unique_ptr<ServerSocket> server_socket(
- new TCPServerSocket(NULL, NetLog::Source()));
+ new TCPServerSocket(NULL, NetLogSource()));
server_socket->ListenWithAddressAndPort("127.0.0.1", 0, 1);
server_.reset(new HttpServer(std::move(server_socket), this));
ASSERT_THAT(server_->GetLocalAddress(&server_address_), IsOk());

Powered by Google App Engine
This is Rietveld 408576698