Remove the unnecessary workaround for NSS bug 455424, now that we require...

net/base/cert_database_nss.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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>
 #include <nssb64.h>    // NSSBase64_EncodeItem()
 #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"
 #include "base/nss_init.h"
 
 namespace net {
 
 CertDatabase::CertDatabase() {
   Init();
 }
@@ skipping 65 matching lines @@
   }
   CERT_DestroyCertificate(cert);
   return is_success;
 }
 
 void CertDatabase::Init() {
   base::EnsureNSSInit();
 }
 
 }  // namespace net