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

Side by Side Diff: net/base/x509_certificate_net_log_param.cc

Issue 10534117: Fix NetLog thread safety issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Update text Created 8 years, 6 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 | Annotate | Revision Log
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/base/x509_certificate_net_log_param.h" 5 #include "net/base/x509_certificate_net_log_param.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 #include "net/base/x509_certificate.h" 12 #include "net/base/x509_certificate.h"
12 13
13 namespace net { 14 namespace net {
14 15
15 base::Value* NetLogX509CertificateCallback(const X509Certificate* certificate, 16 namespace {
16 NetLog::LogLevel log_level) { 17
18 Value* NetLogX509CertificateCallback(
19 scoped_refptr<const X509Certificate> certificate,
20 NetLog::LogLevel log_level) {
17 DictionaryValue* dict = new DictionaryValue(); 21 DictionaryValue* dict = new DictionaryValue();
18 ListValue* certs = new ListValue(); 22 ListValue* certs = new ListValue();
19 std::vector<std::string> encoded_chain; 23 std::vector<std::string> encoded_chain;
20 certificate->GetPEMEncodedChain(&encoded_chain); 24 certificate->GetPEMEncodedChain(&encoded_chain);
21 for (size_t i = 0; i < encoded_chain.size(); ++i) 25 for (size_t i = 0; i < encoded_chain.size(); ++i)
22 certs->Append(base::Value::CreateStringValue(encoded_chain[i])); 26 certs->Append(base::Value::CreateStringValue(encoded_chain[i]));
23 dict->Set("certificates", certs); 27 dict->Set("certificates", certs);
24 return dict; 28 return dict;
25 } 29 }
26 30
31 } // namespace
32
33 NetLog::ParametersCallback CreateNetLogX509CertificateCallback(
34 scoped_refptr<const X509Certificate> certificate) {
35 return base::Bind(&NetLogX509CertificateCallback, certificate);
36 }
37
27 } // namespace net 38 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698