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

Unified Diff: net/socket/transport_client_socket_pool.cc

Issue 822713002: Update from https://crrev.com/309415 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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/transport_client_socket_pool.cc
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index 9d56d2f9ac53150f39639c80163a415b21d3e916..6e544341a484bc0146e968cea58a39f7a6f120ea 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -280,6 +280,11 @@ int TransportConnectJob::DoTransportConnect() {
interval_between_connects_ = CONNECT_INTERVAL_GT_20MS;
}
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "436634 TransportConnectJob::DoTransportConnect1"));
+
helper_.set_next_state(
TransportConnectJobHelper::STATE_TRANSPORT_CONNECT_COMPLETE);
transport_socket_ =
@@ -302,7 +307,18 @@ int TransportConnectJob::DoTransportConnect() {
transport_socket_->EnableTCPFastOpenIfSupported();
}
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "436634 TransportConnectJob::DoTransportConnect2"));
+
int rv = transport_socket_->Connect(helper_.on_io_complete());
+
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile3(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "436634 TransportConnectJob::DoTransportConnect3"));
+
if (rv == ERR_IO_PENDING && try_ipv6_connect_with_ipv4_fallback) {
fallback_timer_.Start(
FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698