From b118bab81f89a91c7be92788eb23b6cc95c9eaa5 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Fri, 28 Feb 2020 12:05:19 -0500
Subject: Issue #1319 - Remove EARLY_BETA_OR_EARLIER condition

---
 build/defines.sh                      |  3 ---
 media/mtransport/nr_socket_prsock.cpp | 17 +----------------
 old-configure.in                      | 13 -------------
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 build/defines.sh

diff --git a/build/defines.sh b/build/defines.sh
deleted file mode 100644
index cf98c3d8b..000000000
--- a/build/defines.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Define indicating that this build is prior to one of the early betas. To be
-# unset mid-way through the beta cycle.
-EARLY_BETA_OR_EARLIER=
diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp
index f22229df8..a95ef1029 100644
--- a/media/mtransport/nr_socket_prsock.cpp
+++ b/media/mtransport/nr_socket_prsock.cpp
@@ -760,15 +760,7 @@ static int ShouldDrop(size_t len) {
     nr_socket_short_term_violation_time = TimeStamp::Now();
 #endif
 
-// Bug 1013007
-#if !EARLY_BETA_OR_EARLIER
     return R_WOULDBLOCK;
-#else
-    MOZ_ASSERT(false,
-               "Short term global rate limit for STUN requests exceeded. Go "
-               "bug bcampen@mozilla.com if you weren't intentionally "
-               "spamming ICE candidates, or don't know what that means.");
-#endif
   }
 
   if (sustained.getTokens(UINT32_MAX) < len) {
@@ -777,15 +769,8 @@ static int ShouldDrop(size_t len) {
 #ifdef MOZILLA_INTERNAL_API
     nr_socket_long_term_violation_time = TimeStamp::Now();
 #endif
-// Bug 1013007
-#if !EARLY_BETA_OR_EARLIER
+
     return R_WOULDBLOCK;
-#else
-    MOZ_ASSERT(false,
-               "Long term global rate limit for STUN requests exceeded. Go "
-               "bug bcampen@mozilla.com if you weren't intentionally "
-               "spamming ICE candidates, or don't know what that means.");
-#endif
   }
 
   // Take len tokens from both buckets.
diff --git a/old-configure.in b/old-configure.in
index 30b020030..c99c49eec 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2227,19 +2227,6 @@ else
   AC_MSG_RESULT([no])
 fi
 
-# Allow influencing configure with a defines.sh script.
-. "${srcdir}/build/defines.sh"
-
-# If we're not building a release build, define EARLY_BETA_OR_EARLIER if it is
-# set in defines.sh
-if test "$BUILDING_RELEASE"; then
-  # Override value in defines.sh, if any
-  EARLY_BETA_OR_EARLIER=
-elif test "$EARLY_BETA_OR_EARLIER"; then
-  AC_DEFINE(EARLY_BETA_OR_EARLIER)
-fi
-AC_SUBST(EARLY_BETA_OR_EARLIER)
-
 # 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],
-- 
cgit v1.2.3