From 89ed051097ae56406972123366870ab0947ed300 Mon Sep 17 00:00:00 2001
From: "wtc@chromium.org"
 <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 1 Dec 2009 19:21:20 +0000
Subject: Remove the unnecessary workaround for NSS bug 455424, now that we
 require NSS 3.12.3 or later.

R=ukai
BUG=none
TEST=No compilation errors.
Review URL: http://codereview.chromium.org/452014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33464 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/base/cert_database_nss.cc   | 4 ----
 net/base/ev_root_ca_metadata.cc | 4 ----
 net/base/keygen_handler_nss.cc  | 4 ----
 3 files changed, 12 deletions(-)

(limited to 'net/base')

diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc
index 5f43fef..605c556 100644
--- a/net/base/cert_database_nss.cc
+++ b/net/base/cert_database_nss.cc
@@ -4,9 +4,6 @@
 
 #include "net/base/cert_database.h"
 
-// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
-// until NSS 3.12.2 comes out and we update to it.
-#define Lock FOO_NSS_Lock
 #include <pk11pub.h>
 #include <secmod.h>
 #include <ssl.h>
@@ -14,7 +11,6 @@
 #include <secder.h>    // DER_Encode()
 #include <cryptohi.h>  // SEC_DerSignData()
 #include <keyhi.h>     // SECKEY_CreateSubjectPublicKeyInfo()
-#undef Lock
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
diff --git a/net/base/ev_root_ca_metadata.cc b/net/base/ev_root_ca_metadata.cc
index 5461108..e2200fe 100644
--- a/net/base/ev_root_ca_metadata.cc
+++ b/net/base/ev_root_ca_metadata.cc
@@ -5,14 +5,10 @@
 #include "net/base/ev_root_ca_metadata.h"
 
 #if defined(OS_LINUX)
-// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
-// until NSS 3.12.2 comes out and we update to it.
-#define Lock FOO_NSS_Lock
 #include <cert.h>
 #include <pkcs11n.h>
 #include <secerr.h>
 #include <secoid.h>
-#undef Lock
 #endif
 
 #include "base/logging.h"
diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
index 9707dfc..2610d7f 100644
--- a/net/base/keygen_handler_nss.cc
+++ b/net/base/keygen_handler_nss.cc
@@ -4,9 +4,6 @@
 
 #include "net/base/keygen_handler.h"
 
-// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
-// until NSS 3.12.2 comes out and we update to it.
-#define Lock FOO_NSS_Lock
 #include <pk11pub.h>
 #include <secmod.h>
 #include <ssl.h>
@@ -14,7 +11,6 @@
 #include <secder.h>    // DER_Encode()
 #include <cryptohi.h>  // SEC_DerSignData()
 #include <keyhi.h>     // SECKEY_CreateSubjectPublicKeyInfo()
-#undef Lock
 
 #include "base/nss_init.h"
 #include "base/logging.h"
-- 
cgit v1.1