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

net/base/ev_root_ca_metadata.cc

 // Copyright (c) 2006-2008 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/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"
 #include "base/singleton.h"
 
 namespace net {
 
 // Raw metadata.
 struct EVMetadata {
   // The SHA-1 fingerprint of the root CA certificate, used as a unique
@@ skipping 241 matching lines @@
     ev_policy_[metadata.fingerprint] = metadata.policy_oid;
     // Multiple root CA certs may use the same EV policy OID.  Having
     // duplicates in the policy_oids_ array does no harm, so we don't
     // bother detecting duplicates.
     policy_oids_.push_back(metadata.policy_oid);
   }
 #endif
 }
 
 }  // namespace net