Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Side by Side Diff: crypto/nss_util.cc

Issue 484603006: Add LOCAL_ prefix to non-UMA histogram macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | net/cert/x509_certificate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "crypto/nss_util.h" 5 #include "crypto/nss_util.h"
6 #include "crypto/nss_util_internal.h" 6 #include "crypto/nss_util_internal.h"
7 7
8 #include <nss.h> 8 #include <nss.h>
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 #include <plarena.h> 10 #include <plarena.h>
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 #endif // defined(USE_NSS) 743 #endif // defined(USE_NSS)
744 } 744 }
745 745
746 // Disable MD5 certificate signatures. (They are disabled by default in 746 // Disable MD5 certificate signatures. (They are disabled by default in
747 // NSS 3.14.) 747 // NSS 3.14.)
748 NSS_SetAlgorithmPolicy(SEC_OID_MD5, 0, NSS_USE_ALG_IN_CERT_SIGNATURE); 748 NSS_SetAlgorithmPolicy(SEC_OID_MD5, 0, NSS_USE_ALG_IN_CERT_SIGNATURE);
749 NSS_SetAlgorithmPolicy(SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION, 749 NSS_SetAlgorithmPolicy(SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION,
750 0, NSS_USE_ALG_IN_CERT_SIGNATURE); 750 0, NSS_USE_ALG_IN_CERT_SIGNATURE);
751 751
752 // The UMA bit is conditionally set for this histogram in 752 // The UMA bit is conditionally set for this histogram in
753 // chrome/common/startup_metric_utils.cc . 753 // components/startup_metric_utils.cc .
754 HISTOGRAM_CUSTOM_TIMES("Startup.SlowStartupNSSInit", 754 LOCAL_HISTOGRAM_CUSTOM_TIMES("Startup.SlowStartupNSSInit",
755 base::TimeTicks::Now() - start_time, 755 base::TimeTicks::Now() - start_time,
756 base::TimeDelta::FromMilliseconds(10), 756 base::TimeDelta::FromMilliseconds(10),
757 base::TimeDelta::FromHours(1), 757 base::TimeDelta::FromHours(1),
758 50); 758 50);
759 } 759 }
760 760
761 // NOTE(willchan): We don't actually execute this code since we leak NSS to 761 // NOTE(willchan): We don't actually execute this code since we leak NSS to
762 // prevent non-joinable threads from using NSS after it's already been shut 762 // prevent non-joinable threads from using NSS after it's already been shut
763 // down. 763 // down.
764 ~NSSInitSingleton() { 764 ~NSSInitSingleton() {
765 #if defined(OS_CHROMEOS) 765 #if defined(OS_CHROMEOS)
766 STLDeleteValues(&chromeos_user_map_); 766 STLDeleteValues(&chromeos_user_map_);
767 #endif 767 #endif
768 tpm_slot_.reset(); 768 tpm_slot_.reset();
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 return time.ToInternalValue() - base::Time::UnixEpoch().ToInternalValue(); 1099 return time.ToInternalValue() - base::Time::UnixEpoch().ToInternalValue();
1100 } 1100 }
1101 1101
1102 #if !defined(OS_CHROMEOS) 1102 #if !defined(OS_CHROMEOS)
1103 PK11SlotInfo* GetPersistentNSSKeySlot() { 1103 PK11SlotInfo* GetPersistentNSSKeySlot() {
1104 return g_nss_singleton.Get().GetPersistentNSSKeySlot(); 1104 return g_nss_singleton.Get().GetPersistentNSSKeySlot();
1105 } 1105 }
1106 #endif 1106 #endif
1107 1107
1108 } // namespace crypto 1108 } // namespace crypto
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | net/cert/x509_certificate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698