Bug 879135, Part 2: Remove mScriptSecurityManager from nsNSSComponent, r=cviecco

--HG--
extra : rebase_source : 3589d5180f3368ec22d67342edb5d7d79fde87d7

security/manager/ssl/src/nsNSSComponent.cpp

@@ -1890,18 +1890,6 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, uint32_t aRSABufLen,
         break;
       }
 
-      if (!mScriptSecurityManager) {
-        MutexAutoLock lock(mutex);
-        // re-test the condition to prevent double initialization
-        if (!mScriptSecurityManager) {
-          mScriptSecurityManager = 
-            do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv2);
-          if (NS_FAILED(rv2)) {
-            break;
-          }
-        }
-      }
-
       //-- Create a certificate principal with id and organization data
       nsAutoString fingerprint;
       rv2 = pCert->GetSha1Fingerprint(fingerprint);

security/manager/ssl/src/nsNSSComponent.h

@@ -20,7 +20,6 @@
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsWeakReference.h"
-#include "nsIScriptSecurityManager.h"
 #ifndef MOZ_DISABLE_CRYPTOLEGACY
 #include "nsIDOMEventTarget.h"
 #include "nsSmartCardMonitor.h"
@@ -300,7 +299,6 @@ private:
   
   Mutex mutex;
   
-  nsCOMPtr<nsIScriptSecurityManager> mScriptSecurityManager;
   nsCOMPtr<nsIStringBundle> mPIPNSSBundle;
   nsCOMPtr<nsIStringBundle> mNSSErrorsBundle;
   nsCOMPtr<nsIURIContentListener> mPSMContentListener;