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

net/socket/ssl_test_util.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 <string>
 #include <algorithm>
 
 #include "net/socket/ssl_test_util.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <wincrypt.h>
 #elif defined(OS_LINUX)
 #include <nspr.h>
 #include <nss.h>
 #include <secerr.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 <ssl.h>
 #include <sslerr.h>
 #include <pk11pub.h>
-#undef Lock
 #include "base/nss_init.h"
 #elif defined(OS_MACOSX)
 #include <Security/Security.h>
 #include "base/scoped_cftyperef.h"
 #include "net/base/x509_certificate.h"
 #endif
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 396 matching lines @@
                   "certificate to your trusted roots for this test to work. "
                   "For more info visit:\n"
                   "http://dev.chromium.org/developers/testing\n";
     return false;
   }
 #endif
   return true;
 }
 
 }  // namespace net