Remove unnecessary instrumentation for several jank bugs.

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 "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "net/base/io_buffer.h"
@@ skipping 45 matching lines @@
 
   result = socket_->Bind(address);
   if (result != OK)
     return result;
 
   bind_address_.reset(new IPEndPoint(address));
   return OK;
 }
 
 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.
   if (socket_->IsValid() && current_address_index_ >= 0)
     return OK;
 
   socket_->StartLoggingMultipleConnectAttempts(addresses_);
 
   // We will try to connect to each address in addresses_. Start with the
   // first one in the list.
@@ skipping 29 matching lines @@
         NOTREACHED() << "bad state " << state;
         rv = ERR_UNEXPECTED;
         break;
     }
   } while (rv != ERR_IO_PENDING && next_connect_state_ != CONNECT_STATE_NONE);
 
   return rv;
 }
 
 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()));
 
   const IPEndPoint& endpoint = addresses_[current_address_index_];
 
-  if (previously_disconnected_) {
-    use_history_.Reset();
-    previously_disconnected_ = false;
-  }
+  {
+    // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
+    tracked_objects::ScopedTracker tracking_profile(
+        FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect"));
 
-  next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
+    if (previously_disconnected_) {
+      use_history_.Reset();
+      previously_disconnected_ = false;
+    }
 
-  if (socket_->IsValid()) {
-    DCHECK(bind_address_);
-  } else {
-    int result = OpenSocket(endpoint.GetFamily());
-    if (result != OK)
-      return result;
+    next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
 
-    if (bind_address_) {
-      result = socket_->Bind(*bind_address_);
-      if (result != OK) {
-        socket_->Close();
+    if (socket_->IsValid()) {
+      DCHECK(bind_address_);
+    } else {
+      int result = OpenSocket(endpoint.GetFamily());
+      if (result != OK)
         return result;
+
+      if (bind_address_) {
+        result = socket_->Bind(*bind_address_);
+        if (result != OK) {
+          socket_->Close();
+          return result;
+        }
       }
     }
   }
 
-  // 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,
                           base::Bind(&TCPClientSocket::DidCompleteConnect,
                                      base::Unretained(this)));
 }
 
 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!
   }
 
   // Close whatever partially connected socket we currently have.
   DoDisconnect();
 
   // Try to fall back to the next address in the list.
   if (current_address_index_ + 1 < static_cast<int>(addresses_.size())) {
@@ skipping 159 matching lines @@
   int result = socket_->Open(family);
   if (result != OK)
     return result;
 
   socket_->SetDefaultOptionsForClient();
 
   return OK;
 }
 
 }  // namespace net