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

Side by Side Diff: net/cert/x509_certificate.cc

Issue 2432283003: Add traces to HttpCache::Transaction to make it easier to follow URLRequests (Closed)
Patch Set: Fix ref Created 4 years, 1 month 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 | « no previous file | net/http/http_cache_transaction.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 "net/cert/x509_certificate.h" 5 #include "net/cert/x509_certificate.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <map> 11 #include <map>
12 #include <memory> 12 #include <memory>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/base64.h" 16 #include "base/base64.h"
17 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/memory/singleton.h" 20 #include "base/memory/singleton.h"
21 #include "base/metrics/histogram_macros.h" 21 #include "base/metrics/histogram_macros.h"
22 #include "base/pickle.h" 22 #include "base/pickle.h"
23 #include "base/profiler/scoped_tracker.h" 23 #include "base/profiler/scoped_tracker.h"
24 #include "base/strings/string_piece.h" 24 #include "base/strings/string_piece.h"
25 #include "base/strings/string_util.h" 25 #include "base/strings/string_util.h"
26 #include "base/synchronization/lock.h" 26 #include "base/synchronization/lock.h"
27 #include "base/time/time.h" 27 #include "base/time/time.h"
28 #include "base/trace_event/trace_event.h"
28 #include "crypto/secure_hash.h" 29 #include "crypto/secure_hash.h"
29 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 30 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
30 #include "net/base/url_util.h" 31 #include "net/base/url_util.h"
31 #include "net/cert/pem_tokenizer.h" 32 #include "net/cert/pem_tokenizer.h"
32 #include "url/url_canon.h" 33 #include "url/url_canon.h"
33 34
34 namespace net { 35 namespace net {
35 36
36 namespace { 37 namespace {
37 38
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 scoped_refptr<X509Certificate> X509Certificate::CreateFromHandle( 229 scoped_refptr<X509Certificate> X509Certificate::CreateFromHandle(
229 OSCertHandle cert_handle, 230 OSCertHandle cert_handle,
230 const OSCertHandles& intermediates) { 231 const OSCertHandles& intermediates) {
231 DCHECK(cert_handle); 232 DCHECK(cert_handle);
232 return new X509Certificate(cert_handle, intermediates); 233 return new X509Certificate(cert_handle, intermediates);
233 } 234 }
234 235
235 // static 236 // static
236 scoped_refptr<X509Certificate> X509Certificate::CreateFromDERCertChain( 237 scoped_refptr<X509Certificate> X509Certificate::CreateFromDERCertChain(
237 const std::vector<base::StringPiece>& der_certs) { 238 const std::vector<base::StringPiece>& der_certs) {
239 TRACE_EVENT0("io", "X509Certificate::CreateFromDERCertChain");
240
238 // TODO(cbentzel): Remove ScopedTracker below once crbug.com/424386 is fixed. 241 // TODO(cbentzel): Remove ScopedTracker below once crbug.com/424386 is fixed.
239 tracked_objects::ScopedTracker tracking_profile( 242 tracked_objects::ScopedTracker tracking_profile(
240 FROM_HERE_WITH_EXPLICIT_FUNCTION( 243 FROM_HERE_WITH_EXPLICIT_FUNCTION(
241 "424386 X509Certificate::CreateFromDERCertChain")); 244 "424386 X509Certificate::CreateFromDERCertChain"));
242 245
243 if (der_certs.empty()) 246 if (der_certs.empty())
244 return NULL; 247 return NULL;
245 248
246 X509Certificate::OSCertHandles intermediate_ca_certs; 249 X509Certificate::OSCertHandles intermediate_ca_certs;
247 for (size_t i = 1; i < der_certs.size(); i++) { 250 for (size_t i = 1; i < der_certs.size(); i++) {
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 RemoveFromCache(cert_handle_); 715 RemoveFromCache(cert_handle_);
713 FreeOSCertHandle(cert_handle_); 716 FreeOSCertHandle(cert_handle_);
714 } 717 }
715 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) { 718 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) {
716 RemoveFromCache(intermediate_ca_certs_[i]); 719 RemoveFromCache(intermediate_ca_certs_[i]);
717 FreeOSCertHandle(intermediate_ca_certs_[i]); 720 FreeOSCertHandle(intermediate_ca_certs_[i]);
718 } 721 }
719 } 722 }
720 723
721 } // namespace net 724 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_cache_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698