| Index: net/socket/tcp_client_socket.cc
|
| diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc
|
| index dcf124bfd6bcd0705cf3a8a2f27e0f5c592032fb..8eda5814cd82b0a82dfd1c721491ebee766ed456 100644
|
| --- a/net/socket/tcp_client_socket.cc
|
| +++ b/net/socket/tcp_client_socket.cc
|
| @@ -63,6 +63,10 @@ int TCPClientSocket::Bind(const IPEndPoint& address) {
|
| }
|
|
|
| int TCPClientSocket::Connect(const CompletionCallback& callback) {
|
| + // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::Connect"));
|
| +
|
| DCHECK(!callback.is_null());
|
|
|
| // If connecting or already connected, then just return OK.
|
| @@ -112,6 +116,10 @@ int TCPClientSocket::DoConnectLoop(int result) {
|
| }
|
|
|
| int TCPClientSocket::DoConnect() {
|
| + // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile1(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect1"));
|
| +
|
| DCHECK_GE(current_address_index_, 0);
|
| DCHECK_LT(current_address_index_, static_cast<int>(addresses_.size()));
|
|
|
| @@ -140,6 +148,10 @@ int TCPClientSocket::DoConnect() {
|
| }
|
| }
|
|
|
| + // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile2(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect2"));
|
| +
|
| // |socket_| is owned by this class and the callback won't be run once
|
| // |socket_| is gone. Therefore, it is safe to use base::Unretained() here.
|
| return socket_->Connect(endpoint,
|
| @@ -148,6 +160,11 @@ int TCPClientSocket::DoConnect() {
|
| }
|
|
|
| int TCPClientSocket::DoConnectComplete(int result) {
|
| + // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "436634 TCPClientSocket::DoConnectComplete"));
|
| +
|
| if (result == OK) {
|
| use_history_.set_was_ever_connected();
|
| return OK; // Done!
|
|
|