mozilla-inbound: changeset 116060:d8be8785e3a7da63748b0e5103026aa618e5aabd

author	Camilo Viecco <cviecco@mozilla.com>
	Fri, 14 Dec 2012 09:10:44 -0800
changeset 116060	d8be8785e3a7da63748b0e5103026aa618e5aabd
parent 116059	1c74122a6fcfeb556a1cebe979b74b9f85dddef6
child 116061	8afa0fd12d00acec7182b99a5e99042c156a5ed3
push id	19708
push user	cviecco@mozilla.com
push date	Fri, 14 Dec 2012 17:13:29 +0000
treeherder	mozilla-inbound@d8be8785e3a7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bsmith
bugs	819429
milestone	20.0a1
first release with	nightly linux32 c8a1314aa449 / 20.0a1 / 20121217030850 / files nightly linux64 c8a1314aa449 / 20.0a1 / 20121217030850 / files nightly mac c8a1314aa449 / 20.0a1 / 20121217030850 / files nightly win32 c8a1314aa449 / 20.0a1 / 20121217030850 / files nightly win64 c8a1314aa449 / 20.0a1 / 20121217030850 / files
last release without	nightly linux32 b11065872128 / 20.0a1 / 20121214030827 / files nightly linux64 b11065872128 / 20.0a1 / 20121214030827 / files nightly mac b11065872128 / 20.0a1 / 20121214030827 / files nightly win32 b11065872128 / 20.0a1 / 20121214030827 / files nightly win64 b11065872128 / 20.0a1 / 20121214030827 / files

--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -99,17 +99,16 @@ nsNSSCertificateDB::FindCertByNickname(n
 }
 
 NS_IMETHODIMP 
 nsNSSCertificateDB::FindCertByDBKey(const char *aDBkey, nsISupports *aToken,
                                    nsIX509Cert **_cert)
 {
   NS_ENSURE_ARG_POINTER(aDBkey);
   NS_ENSURE_ARG(aDBkey[0]);
-  NS_ENSURE_ARG_POINTER(aToken);
   NS_ENSURE_ARG_POINTER(_cert);
   *_cert = nullptr;
 
   nsNSSShutDownPreventionLock locker;
   SECItem keyItem = {siBuffer, nullptr, 0};
   SECItem *dummy;
   CERTIssuerAndSN issuerSN;
   //unsigned long moduleID,slotID;