Mark the leak of bug 77990 as intentional and adjust the suppression

to be as wide as possible to cover all variants of this leak.

Remove the suppression for the leak of bug 95718 because it is a
variant of the above leak.

R=cbentzel@chromium.org
BUG=77990
TEST=none

Review URL: http://codereview.chromium.org/8823019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113474 0039d316-1c4b-4281-b951-d872f2087c98

tools/valgrind/memcheck/suppressions.txt

@@ -984,6 +984,16 @@
    fun:_ZN3net18SSLClientSocketNSS11DoHandshakeEv
    fun:_ZN3net18SSLClientSocketNSS15DoHandshakeLoopEi
 }
+{
+   # Intentionally leaking NSS to prevent shutdown crashes
+   bug_77990 (Intentional)
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:error_get_my_stack
+   fun:nss_ClearErrorStack
+   fun:NSSArena_Destroy
+}
 {
    bug_83345 (Needs_Annotation)
    Memcheck:Leak
@@ -3207,23 +3217,6 @@
    fun:_ZN25ResolveProxyMsgHelperTest13GenerateReplyEv
    fun:*ResolveProxyMsgHelperTest_*_Test8TestBodyEv
 }
-{
-   bug_77990
-   Memcheck:Leak
-   fun:calloc
-   ...
-   fun:error_get_my_stack
-   fun:nss_ClearErrorStack
-   fun:NSSArena_Destroy
-   fun:nssList_Destroy
-   fun:nssCertificateStore_RemoveCertLOCKED
-   fun:nssCertificate_Destroy
-   ...
-   fun:ssl_DestroySID
-   fun:ssl_FreeLockedSID
-   fun:UncacheSID
-   fun:SSL_ClearSessionCache
-}
 {
    bug_78201
    Memcheck:Leak

tools/valgrind/memcheck/suppressions_mac.txt

@@ -1741,27 +1741,6 @@
    fun:_ZN5media27FFmpegVideoDecodeEngineTestD2Ev
    fun:_ZN5media51FFmpegVideoDecodeEngineTest_DecodeFrame_Normal_TestD0Ev
 }
-{
-   bug_95718
-   Memcheck:Leak
-   fun:calloc
-   ...
-   fun:error_get_my_stack
-   fun:nss_ClearErrorStack
-   fun:NSSArena_Destroy
-   fun:nssList_Destroy
-   fun:remove_subject_entry
-   ...
-   fun:nssCertificate_Destroy
-   fun:NSSCertificate_Destroy
-   fun:CERT_DestroyCertificate
-   ...
-   fun:SSL_ClearSessionCache
-   ...
-   fun:_ZN3net19NSSSSLInitSingletonD1Ev
-   ...
-   fun:_ZN4base12LazyInstanceIN3net19NSSSSLInitSingletonENS_25DefaultLazyInstanceTraitsIS2_EEE6OnExitEPv
-}
 {
    bug_95718_b
    Memcheck:Leak