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

base/nss_init.cc

 // Copyright (c) 2008-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 "base/nss_init.h"
 
 #include <dlfcn.h>
 #include <nss.h>
 #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"
 #include "base/singleton.h"
 #include "base/string_util.h"
 
 namespace {
 
 std::string GetDefaultConfigDirectory() {
   const char* home = getenv("HOME");
@@ skipping 146 matching lines @@
 
 void EnsureNSPRInit() {
   Singleton<NSPRInitSingleton>::get();
 }
 
 void EnsureNSSInit() {
   Singleton<NSSInitSingleton>::get();
 }
 
 }  // namespace base