Issue #1877 - Resolve RELEASE_OR_BETA conditionals.

2 files changed, 2 insertions, 17 deletions

diff --git a/netwerk/base/security-prefs.js b/netwerk/base/security-prefs.js
index 9d89979470..f22a49444b 100644
--- a/netwerk/base/security-prefs.js
+++ b/netwerk/base/security-prefs.js
@@ -90,11 +90,7 @@ pref("security.pki.sha1_enforcement_level", 3);
 // 2: fall back to the subject common name for certificates valid before 23
 //    August 2015 if necessary
 // 3: only use name information from the subject alternative name extension
-#ifdef RELEASE_OR_BETA
 pref("security.pki.name_matching_mode", 1);
-#else
-pref("security.pki.name_matching_mode", 2);
-#endif
 
 // security.pki.netscape_step_up_policy controls how the platform handles the
 // id-Netscape-stepUp OID in extended key usage extensions of CA certificates.
@@ -102,11 +98,7 @@ pref("security.pki.name_matching_mode", 2);
 // 1: it is considered equivalent when the notBefore is before 23 August 2016
 // 2: similarly, but for 23 August 2015
 // 3: it is never considered equivalent
-#ifdef RELEASE_OR_BETA
 pref("security.pki.netscape_step_up_policy", 1);
-#else
-pref("security.pki.netscape_step_up_policy", 2);
-#endif
 
 // Configures Certificate Transparency support mode:
 // 0: Fully disabled.
@@ -129,11 +121,5 @@ pref("security.ssl.enable_tls13_compat_mode", false);
 // If a request is mixed-content, send an HSTS priming request to attempt to
 // see if it is available over HTTPS.
 pref("security.mixed_content.send_hsts_priming", true);
-#ifdef RELEASE_OR_BETA
 // Don't change the order of evaluation of mixed-content and HSTS upgrades
 pref("security.mixed_content.use_hsts", false);
-#else
-// Change the order of evaluation so HSTS upgrades happen before
-// mixed-content blocking
-pref("security.mixed_content.use_hsts", true);
-#endif
diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
index da2a6d7268..c3a288e689 100644
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -146,11 +145,11 @@ GetRequestingPrincipal(const FTPChannelCreationArgs& aArgs)
 
 // Bug 1289001 - If GetValidatedOriginAttributes returns an error string, that
 // usually leads to a content crash with very little info about the cause.
-// We prefer to crash on the parent, so we get the reason in the crash report.
+// We prefer to crash on the parent.
 static MOZ_COLD
 void CrashWithReason(const char * reason)
 {
-#ifndef RELEASE_OR_BETA
+#ifdef DEBUG
   MOZ_CRASH_UNSAFE_OOL(reason);
 #endif
 }