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

Unified Diff: base/nss_init.cc

Issue 452014: Remove the unnecessary workaround for NSS bug 455424, now that we require... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add ssl_client_socket_nss.cc to the CL. Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/crypto/signature_creator_nss.cc ('k') | net/base/cert_database_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/nss_init.cc
===================================================================
--- base/nss_init.cc (revision 33327)
+++ base/nss_init.cc (working copy)
@@ -9,14 +9,9 @@
#include <plarena.h>
#include <prerror.h>
#include <prinit.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>
-#undef Lock
#include "base/file_util.h"
#include "base/logging.h"
« no previous file with comments | « base/crypto/signature_creator_nss.cc ('k') | net/base/cert_database_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698