Remove unnecessary instrumentation for several jank bugs.

net/socket/ssl_session_cache_openssl.cc

Index: net/socket/ssl_session_cache_openssl.cc
diff --git a/net/socket/ssl_session_cache_openssl.cc b/net/socket/ssl_session_cache_openssl.cc
index 9f7a37bb100df3dffd023fe4a14d6f5b5dc93a1f..3e0879c8cd058b9e5f83ff0e2712f16e02e80247 100644
--- a/net/socket/ssl_session_cache_openssl.cc
+++ b/net/socket/ssl_session_cache_openssl.cc
@@ -13,7 +13,6 @@
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
 #include "base/synchronization/lock.h"
 
 namespace net {
@@ -157,11 +156,6 @@ class SSLSessionCacheOpenSSLImpl {
   SSLSessionCacheOpenSSLImpl(SSL_CTX* ctx,
                              const SSLSessionCacheOpenSSL::Config& config)
       : ctx_(ctx), config_(config), expiration_check_(0) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::SSLSessionCacheOpenSSLImpl"));
-
     DCHECK(ctx);
 
     // NO_INTERNAL_STORE disables OpenSSL's builtin cache, and
@@ -202,11 +196,6 @@ class SSLSessionCacheOpenSSLImpl {
   //
   // Return true if a cached session ID was found, false otherwise.
   bool SetSSLSession(SSL* ssl) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::SetSSLSession"));
-
     std::string cache_key = config_.key_func(ssl);
     if (cache_key.empty())
       return false;
@@ -217,11 +206,6 @@ class SSLSessionCacheOpenSSLImpl {
   // Variant of SetSSLSession to be used when the client already has computed
   // the cache key. Avoid a call to the configuration's |key_func| function.
   bool SetSSLSessionWithKey(SSL* ssl, const std::string& cache_key) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::SetSSLSessionWithKey"));
-
     base::AutoLock locked(lock_);
 
     DCHECK_EQ(config_.key_func(ssl), cache_key);
@@ -254,11 +238,6 @@ class SSLSessionCacheOpenSSLImpl {
   }
 
   void MarkSSLSessionAsGood(SSL* ssl) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::MarkSSLSessionAsGood"));
-
     SSL_SESSION* session = SSL_get_session(ssl);
     if (!session)
       return;
@@ -270,11 +249,6 @@ class SSLSessionCacheOpenSSLImpl {
 
   // Flush all entries from the cache.
   void Flush() {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::Flush"));
-
     base::AutoLock lock(lock_);
     id_index_.clear();
     key_index_.clear();
@@ -369,11 +343,6 @@ class SSLSessionCacheOpenSSLImpl {
   // to indicate that it took ownership of the session, i.e. that the caller
   // should not decrement its reference count after completion.
   static int NewSessionCallbackStatic(SSL* ssl, SSL_SESSION* session) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::NewSessionCallbackStatic"));
-
     GetCache(ssl->ctx)->OnSessionAdded(ssl, session);
     return 1;
   }
@@ -381,11 +350,6 @@ class SSLSessionCacheOpenSSLImpl {
   // Called by OpenSSL to indicate that a session must be removed from the
   // cache. This happens when SSL_CTX is destroyed.
   static void RemoveSessionCallbackStatic(SSL_CTX* ctx, SSL_SESSION* session) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::RemoveSessionCallbackStatic"));
-
     GetCache(ctx)->OnSessionRemoved(session);
   }
 
@@ -407,11 +371,6 @@ class SSLSessionCacheOpenSSLImpl {
   static int GenerateSessionIdStatic(const SSL* ssl,
                                      unsigned char* id,
                                      unsigned* id_len) {
-    // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
-    tracked_objects::ScopedTracker tracking_profile(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "424386 SSLSessionCacheOpenSSLImpl::GenerateSessionIdStatic"));
-
     if (!GetCache(ssl->ctx)->OnGenerateSessionId(id, *id_len))
       return 0;