NetLog: Rework ConnectJob logging.
This CL makes it so that the events for nested ConnectJobs are nested
within their parent ConnectJob. This both reduces the number of top
level CONNECT_JOB events in logs, making navigation between top-level
events easier, and makes it easier to see all information related to
establishing a single connection at once.
This didn't used to be possible because there was a socket pool between
nested ConnectJob classes, which introduced a layer of late binding.
However, most of those intermediary socket pools have been removed,
so the events can now be nested directly, for the most part.
Bug: 926899
Change-Id: I7d51ae9e164560fdb0396f21b0ac85370c4b7ae7
Reviewed-on: https://chromium-review.googlesource.com/c/1478259
Reviewed-by: Eric Roman <[email protected]>
Commit-Queue: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#634886}diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index b63f49d..335c26e 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -329,26 +329,26 @@
ConnectJob::Delegate* delegate,
MockClientSocketFactory* client_socket_factory,
NetLog* net_log)
- : ConnectJob(
- request.priority(),
- timeout_duration,
- CommonConnectJobParams(
- group_name,
- request.socket_tag(),
- request.respect_limits() ==
- ClientSocketPool::RespectLimits::ENABLED,
- nullptr /* client_socket_factory */,
- nullptr /* host_resolver */,
- nullptr /* proxy_delegate */,
- SSLClientSocketContext(),
- SSLClientSocketContext(),
- nullptr /* socket_performance_watcher_factory */,
- nullptr /* network_quality_estimator */,
- net_log,
- nullptr /* websocket_endpoint_lock_manager */),
- delegate,
- NetLogWithSource::Make(net_log,
- NetLogSourceType::TRANSPORT_CONNECT_JOB)),
+ : ConnectJob(request.priority(),
+ timeout_duration,
+ CommonConnectJobParams(
+ group_name,
+ request.socket_tag(),
+ request.respect_limits() ==
+ ClientSocketPool::RespectLimits::ENABLED,
+ nullptr /* client_socket_factory */,
+ nullptr /* host_resolver */,
+ nullptr /* proxy_delegate */,
+ SSLClientSocketContext(),
+ SSLClientSocketContext(),
+ nullptr /* socket_performance_watcher_factory */,
+ nullptr /* network_quality_estimator */,
+ net_log,
+ nullptr /* websocket_endpoint_lock_manager */),
+ delegate,
+ nullptr /* net_log */,
+ NetLogSourceType::TRANSPORT_CONNECT_JOB,
+ NetLogEventType::TRANSPORT_CONNECT_JOB_CONNECT),
job_type_(job_type),
client_socket_factory_(client_socket_factory),
load_state_(LOAD_STATE_IDLE),
