Reland: HTML Pack Extension Dialog / Linux & Mac Packaging Support

base/crypto/signature_creator_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 "base/crypto/signature_creator.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 <cryptohi.h>
 #include <keyhi.h>
 #include <stdlib.h>
+#undef Lock
 
 #include "base/logging.h"
 #include "base/nss_init.h"
 #include "base/scoped_ptr.h"
 
 namespace base {
 
 // static
 SignatureCreator* SignatureCreator::Create(RSAPrivateKey* key) {
   scoped_ptr<SignatureCreator> result(new SignatureCreator);
@@ skipping 47 matching lines @@
     NOTREACHED();
     return false;
   }
   signature->assign(signature_item.data,
                     signature_item.data + signature_item.len);
   SECITEM_FreeItem(&signature_item, PR_FALSE);
   return true;
 }
 
 }  // namespace base