bug 1603834 - let cert_storage and intermediate preloading ride the trains r=jcj,froydnj

(intermediate preloading is still disabled on mobile for now)

Differential Revision: https://phabricator.services.mozilla.com/D63560

--HG--
extra : moz-landing-system : lando

old-configure.in

@@ -1628,12 +1628,6 @@ else
   AC_MSG_RESULT([no])
 fi
 
-if test "$EARLY_BETA_OR_EARLIER"; then
-    MOZ_NEW_CERT_STORAGE=1
-    AC_DEFINE(MOZ_NEW_CERT_STORAGE)
-fi
-AC_SUBST(MOZ_NEW_CERT_STORAGE)
-
 # Allow someone to change MOZ_APP_NAME and MOZ_APP_BASENAME in mozconfig
 MOZ_ARG_WITH_STRING(app-name,
 [--with-app-name=APPNAME sets MOZ_APP_NAME to APPNAME],

toolkit/moz.configure

@@ -2017,3 +2017,11 @@ def forkserver_flag(value, target):
 
 set_config('MOZ_ENABLE_FORKSERVER', forkserver_flag)
 set_define('MOZ_ENABLE_FORKSERVER', forkserver_flag, forkserver_flag)
+
+# new cert storage implementation
+# ==============================================================
+option('--disable-new-cert-storage', env='MOZ_NEW_CERT_STORAGE',
+       help='{Enable|Disable} new certificate storage')
+
+set_config('MOZ_NEW_CERT_STORAGE', True, when='--enable-new-cert-storage')
+set_define('MOZ_NEW_CERT_STORAGE', True, when='--enable-new-cert-storage')