Remove stale ScopedTrackers.

net/socket/tcp_client_socket.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/tcp_client_socket.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 133 matching lines @@
 
   return rv;
 }
 
 int TCPClientSocket::DoConnect() {
   DCHECK_GE(current_address_index_, 0);
   DCHECK_LT(current_address_index_, static_cast<int>(addresses_.size()));
 
   const IPEndPoint& endpoint = addresses_[current_address_index_];
 
-  {
-    // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect"));
+  if (previously_disconnected_) {
+    use_history_.Reset();
+    connection_attempts_.clear();
+    previously_disconnected_ = false;
+  }
 
-    if (previously_disconnected_) {
-      use_history_.Reset();
-      connection_attempts_.clear();
-      previously_disconnected_ = false;
-    }
+  next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
 
-    next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
+  if (socket_->IsValid()) {
+    DCHECK(bind_address_);
+  } else {
+    int result = OpenSocket(endpoint.GetFamily());
+    if (result != OK)
+      return result;
 
-    if (socket_->IsValid()) {
-      DCHECK(bind_address_);
-    } else {
-      int result = OpenSocket(endpoint.GetFamily());
-      if (result != OK)
+    if (bind_address_) {
+      result = socket_->Bind(*bind_address_);
+      if (result != OK) {
+        socket_->Close();
         return result;
-
-      if (bind_address_) {
-        result = socket_->Bind(*bind_address_);
-        if (result != OK) {
-          socket_->Close();
-          return result;
-        }
       }
     }
   }
 
   // Notify |socket_performance_watcher_| only if the |socket_| is reused to
   // connect to a different IP Address.
   if (socket_performance_watcher_ && current_address_index_ != 0)
     socket_performance_watcher_->OnConnectionChanged();
 
   // |socket_| is owned by this class and the callback won't be run once
@@ skipping 213 matching lines @@
 void TCPClientSocket::EmitTCPMetricsHistogramsOnDisconnect() {
   base::TimeDelta rtt;
   if (socket_->GetEstimatedRoundTripTime(&rtt)) {
     UMA_HISTOGRAM_CUSTOM_TIMES("Net.TcpRtt.AtDisconnect", rtt,
                                base::TimeDelta::FromMilliseconds(1),
                                base::TimeDelta::FromMinutes(10), 100);
   }
 }
 
 }  // namespace net