Backed out changeset 7811ebf7e321 (bug 1114882) for Android S4 orange on a CLOSED TREE

security/manager/ssl/src/nsNSSComponent.cpp

@@ -157,7 +157,6 @@ bool EnsureNSSInitialized(EnsureNSSOperator op)
     // call do_GetService for nss component to ensure it.
   case nssEnsure:
   case nssEnsureOnChromeOnly:
-  case nssEnsureChromeOrContent:
     // We are reentered during nss component creation or nss component is already up
     if (PR_AtomicAdd(&haveLoaded, 0) || loading)
       return true;

security/manager/ssl/src/nsNSSComponent.h

@@ -55,8 +55,7 @@ enum EnsureNSSOperator
   nssInitFailed = 2,
   nssShutdown = 3,
   nssEnsure = 100,
-  nssEnsureOnChromeOnly = 101,
+  nssEnsureOnChromeOnly = 101
-  nssEnsureChromeOrContent = 102,
 };
 
 extern bool EnsureNSSInitializedChromeOrContent();

security/manager/ssl/src/nsNSSModule.cpp

@@ -93,14 +93,8 @@ _InstanceClassChrome##Constructor(nsISupports *aOuter, REFNSIID aIID,         \
         return rv;                                                            \
     }                                                                         \
                                                                               \
-    if (!NS_IS_PROCESS_DEFAULT &&                                             \
+    if (!EnsureNSSInitialized(ensureOperator))                                \
-        ensureOperator == nssEnsureChromeOrContent) {                         \
-        if (!EnsureNSSInitializedChromeOrContent()) {                         \
-            return NS_ERROR_FAILURE;                                          \
-        }                                                                     \
-    } else if (!EnsureNSSInitialized(ensureOperator)) {                       \
         return NS_ERROR_FAILURE;                                              \
-    }                                                                         \
                                                                               \
     if (NS_IS_PROCESS_DEFAULT)                                                \
         NS_NSS_INSTANTIATE(ensureOperator, _InstanceClassChrome);             \
@@ -199,7 +193,7 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCertTree)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsPkcs11)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCertPicker)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, nsNTLMAuthModule, InitTest)
-NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureChromeOrContent, nsCryptoHash)
+NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCryptoHash)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCryptoHMAC)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsStreamCipher)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsKeyObject)

security/manager/ssl/tests/unit/test_hash_algorithms_wrap.js

@@ -1,3 +0,0 @@
-function run_test() {
-  run_test_in_child("test_hash_algorithms.js");
-}

security/manager/ssl/tests/unit/xpcshell.ini

@@ -22,9 +22,6 @@ support-files =
 
 [test_datasignatureverifier.js]
 [test_hash_algorithms.js]
-[test_hash_algorithms_wrap.js]
-# bug 1124289 - run_test_in_child violates the sandbox on b2g
-skip-if = toolkit == 'gonk'
 [test_hmac.js]
 
 [test_sts_preloadlist_perwindowpb.js]