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

Side by Side Diff: chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h

Issue 2804042: Incomplete changes to make scoped_ptr_malloc use plain functions. (Closed)
Patch Set: chrome now builds & links Created 10 years, 5 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 | « chrome/gpu/x_util.cc ('k') | gfx/gtk_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 29 matching lines...) Expand all
40 40
41 #ifndef CHROME_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTHELPER_H_ 41 #ifndef CHROME_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTHELPER_H_
42 #define CHROME_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTHELPER_H_ 42 #define CHROME_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTHELPER_H_
43 43
44 #include <cert.h> 44 #include <cert.h>
45 45
46 #include <string> 46 #include <string>
47 47
48 #include "base/scoped_ptr.h" 48 #include "base/scoped_ptr.h"
49 49
50 class FreePRArenaPool { 50 inline void FreePRArenaPool(PRArenaPool* x) {
51 public: 51 PORT_FreeArena(x, PR_FALSE);
52 inline void operator()(PRArenaPool* x) const { 52 }
53 PORT_FreeArena(x, PR_FALSE);
54 }
55 };
56 typedef scoped_ptr_malloc<PRArenaPool, FreePRArenaPool> ScopedPRArenaPool; 53 typedef scoped_ptr_malloc<PRArenaPool, FreePRArenaPool> ScopedPRArenaPool;
57 54
58 namespace mozilla_security_manager { 55 namespace mozilla_security_manager {
59 56
60 // Constants to classify the type of a certificate. (In Mozilla this is actually 57 // Constants to classify the type of a certificate. (In Mozilla this is actually
61 // defined in nsIX509Cert.idl) 58 // defined in nsIX509Cert.idl)
62 enum CertType { 59 enum CertType {
63 UNKNOWN_CERT, 60 UNKNOWN_CERT,
64 CA_CERT, 61 CA_CERT,
65 USER_CERT, 62 USER_CERT,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 std::string ProcessKeyUsageExtension(SECItem* extension_data); 105 std::string ProcessKeyUsageExtension(SECItem* extension_data);
109 std::string ProcessExtKeyUsage(SECItem* extension_data); 106 std::string ProcessExtKeyUsage(SECItem* extension_data);
110 std::string ProcessExtensionData(SECOidTag oid_tag, SECItem* extension_data); 107 std::string ProcessExtensionData(SECOidTag oid_tag, SECItem* extension_data);
111 std::string ProcessSubjectPublicKeyInfo(CERTSubjectPublicKeyInfo* spki); 108 std::string ProcessSubjectPublicKeyInfo(CERTSubjectPublicKeyInfo* spki);
112 109
113 CertType GetCertType(CERTCertificate *cert); 110 CertType GetCertType(CERTCertificate *cert);
114 111
115 } // namespace mozilla_security_manager 112 } // namespace mozilla_security_manager
116 113
117 #endif // CHROME_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTHELPER_H_ 114 #endif // CHROME_THIRD_PARTY_MOZILLA_SECURITY_MANAGER_NSNSSCERTHELPER_H_
OLDNEW
« no previous file with comments | « chrome/gpu/x_util.cc ('k') | gfx/gtk_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698