summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 10:41:22 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 10:41:22 +0000
commitd24bf76429992da81d702d59ede86cfeda30ca19 (patch)
tree6067bee5ec98848d6784b04ff6ffa401741a693a /net/base
parentc2408ff31d097f5925704b6c80103ae7081a46dc (diff)
downloadchromium_src-d24bf76429992da81d702d59ede86cfeda30ca19.zip
chromium_src-d24bf76429992da81d702d59ede86cfeda30ca19.tar.gz
chromium_src-d24bf76429992da81d702d59ede86cfeda30ca19.tar.bz2
Change the old type name PRArenaPool to PLArenaPool.
Remove a workaround in x509_certificate_win.cc for a blapi.h header problem that has been fixed. R=rsleevi@chromium.org BUG=none TEST=no compilation errors Review URL: http://codereview.chromium.org/9653020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/x509_certificate_nss.cc2
-rw-r--r--net/base/x509_certificate_win.cc1
2 files changed, 1 insertions, 2 deletions
diff --git a/net/base/x509_certificate_nss.cc b/net/base/x509_certificate_nss.cc
index 5340087..835f9ee 100644
--- a/net/base/x509_certificate_nss.cc
+++ b/net/base/x509_certificate_nss.cc
@@ -846,7 +846,7 @@ void X509Certificate::GetSubjectAltName(
if (rv != SECSuccess)
return;
- PRArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+ PLArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
DCHECK(arena != NULL);
CERTGeneralName* alt_name_list;
diff --git a/net/base/x509_certificate_win.cc b/net/base/x509_certificate_win.cc
index 05aa880..2f1bcac 100644
--- a/net/base/x509_certificate_win.cc
+++ b/net/base/x509_certificate_win.cc
@@ -4,7 +4,6 @@
#include "net/base/x509_certificate.h"
-#define PRArenaPool PLArenaPool // Required by <blapi.h>.
#include <blapi.h> // Implement CalculateChainFingerprint() with NSS.
#include "base/lazy_instance.h"