Update from https://crrev.com/309717

net/ssl/openssl_platform_key_win.cc

 // Copyright 2014 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/ssl/openssl_platform_key.h"
 
 #include <windows.h>
 #include <NCrypt.h>
 
 #include <string.h>
@@ skipping 10 matching lines @@
 #include <openssl/md5.h>
 #include <openssl/obj_mac.h>
 #include <openssl/rsa.h>
 #include <openssl/sha.h>
 
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/profiler/scoped_tracker.h"
 #include "base/win/windows_version.h"
 #include "crypto/scoped_capi_types.h"
 #include "crypto/wincrypt_shim.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/openssl_ssl_util.h"
 
 namespace net {
 
 namespace {
@@ skipping 148 matching lines @@
   const KeyExData* ex_data = RsaGetExData(rsa);
   return (ex_data->key_length + 7) / 8;
 }
 
 int RsaMethodSign(int hash_nid,
                   const uint8_t* in,
                   unsigned in_len,
                   uint8_t* out,
                   unsigned* out_len,
                   const RSA* rsa) {
+  // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 RsaMethodSign"));
+
   // TODO(davidben): Switch BoringSSL's sign hook to using size_t rather than
   // unsigned.
   const KeyExData* ex_data = RsaGetExData(rsa);
   if (!ex_data) {
     NOTREACHED();
     OPENSSL_PUT_ERROR(RSA, RSA_sign, ERR_R_INTERNAL_ERROR);
     return 0;
   }
 
   if (ex_data->key->dwKeySpec == CERT_NCRYPT_KEY_SPEC) {
@@ skipping 215 matching lines @@
   // http://msdn.microsoft.com/en-us/library/windows/desktop/aa375520(v=vs.85).aspx
   // which uses the same length for both.
   return (ex_data->key_length + 7) / 8;
 }
 
 int EcdsaMethodSign(const uint8_t* digest,
                     size_t digest_len,
                     uint8_t* out_sig,
                     unsigned int* out_sig_len,
                     EC_KEY* ec_key) {
+  // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 EcdsaMethodSign"));
+
   const KeyExData* ex_data = EcKeyGetExData(ec_key);
   // Only CNG supports ECDSA.
   if (!ex_data || ex_data->key->dwKeySpec != CERT_NCRYPT_KEY_SPEC) {
     NOTREACHED();
     OPENSSL_PUT_ERROR(RSA, sign_raw, ERR_R_INTERNAL_ERROR);
     return 0;
   }
 
   size_t degree = (ex_data->key_length + 7) / 8;
   if (degree == 0) {
@@ skipping 222 matching lines @@
     case EVP_PKEY_RSA:
       return CreateRSAWrapper(key.Pass(), key_length);
     case EVP_PKEY_EC:
       return CreateECDSAWrapper(key.Pass(), key_length);
     default:
       return nullptr;
   }
 }
 
 }  // namespace net