Revert "Bug 2018009 - Max bandwidth should check usage info and entitlement before defaulting to MAX_IN_GB. r=ip-protection-reviewers,fchasen" for causing bc failures @ browser_ipprotection_alert_manager.js

This reverts commit 9517e4b.

Author: smolnar-sheriff

browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs

@@ -38,10 +38,6 @@ class IPPEnrollAndEntitleManagerSingleton extends EventTarget {
     this.handleEvent = this.#handleEvent.bind(this);
   }
 
-  get entitlement() {
-    return this.#entitlement;
-  }
-
   init() {
     // We will use data from the cache until we are fully functional. Then we
     // will recompute the state in `initOnStartupCompleted`.

browser/components/ipprotection/IPProtectionAlertManager.sys.mjs

@@ -2,8 +2,6 @@
  * 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/. */
 
-import { BANDWIDTH } from "chrome://browser/content/ipprotection/ipprotection-constants.mjs";
-
 const lazy = {};
 
 ChromeUtils.defineLazyGetter(lazy, "ipProtectionLocalization", () => {
@@ -12,8 +10,6 @@ ChromeUtils.defineLazyGetter(lazy, "ipProtectionLocalization", () => {
 
 ChromeUtils.defineESModuleGetters(lazy, {
   EveryWindow: "resource:///modules/EveryWindow.sys.mjs",
-  IPPEnrollAndEntitleManager:
-    "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs",
   IPPProxyManager:
     "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs",
   IPPProxyStates:
@@ -68,10 +64,7 @@ class IPProtectionAlertManagerClass {
         errorBody,
       ] = lazy.ipProtectionLocalization.formatMessagesSync([
         { id: "vpn-paused-alert-title" },
-        {
-          id: "vpn-paused-alert-body",
-          args: { maxUsage: this.#getMaxBandwidthUsage() },
-        },
+        { id: "vpn-paused-alert-body", args: { maxUsage: 150 } },
         { id: "vpn-paused-alert-close-tabs-button" },
         { id: "vpn-paused-alert-continue-wo-vpn-button" },
         { id: "vpn-error-alert-title" },
@@ -91,26 +84,6 @@ class IPProtectionAlertManagerClass {
     return this.#localizationMessages;
   }
 
-  /**
-   * Check usage info for the max usage, then entitlement, then default to
-   * BANDWIDTH.MAX_IN_GB.
-   *
-   * @returns {object} An object with max and remaining as numbers
-   */
-  #getMaxBandwidthUsage() {
-    if (lazy.IPPProxyManager.usageInfo?.max != null) {
-      return Number(lazy.IPPProxyManager.usageInfo.max) / BANDWIDTH.BYTES_IN_GB;
-    } else if (lazy.IPPEnrollAndEntitleManager.entitlement?.maxBytes != null) {
-      // Usage info doesn't exist yet. Check the entitlement
-      return (
-        Number(lazy.IPPEnrollAndEntitleManager.entitlement?.maxBytes) /
-        BANDWIDTH.BYTES_IN_GB
-      );
-    }
-
-    return BANDWIDTH.MAX_IN_GB;
-  }
-
   handleEvent(event) {
     if (event.type !== "IPPProxyManager:StateChanged") {
       return;

browser/components/ipprotection/IPProtectionPanel.sys.mjs

@@ -677,33 +677,17 @@ export class IPProtectionPanel {
   /**
    * BigInts throw when using JSON.stringify or when using arithmetic with
    * numbers so we convert them to numbers here so they max and remaining can
-   * be safely used. Check usageInfo first, if that doesn't exist, check the
-   * entitlement. If neither exist, return null.
+   * be safely used.
    *
    * @returns {object} An object with max and remaining as numbers
    */
   #getBandwidthUsage() {
-    if (
-      lazy.BANDWIDTH_USAGE_ENABLED &&
-      lazy.IPPProxyManager.usageInfo?.max != null
-    ) {
+    if (lazy.BANDWIDTH_USAGE_ENABLED && lazy.IPPProxyManager.usageInfo) {
       return {
         max: Number(lazy.IPPProxyManager.usageInfo.max),
         remaining: Number(lazy.IPPProxyManager.usageInfo.remaining),
         reset: lazy.IPPProxyManager.usageInfo.reset,
       };
-    } else if (
-      lazy.BANDWIDTH_USAGE_ENABLED &&
-      lazy.IPPEnrollAndEntitleManager.entitlement?.maxBytes != null
-    ) {
-      // Usage info doesn't exist yet. Check the entitlement
-      return {
-        max: Number(lazy.IPPEnrollAndEntitleManager.entitlement?.maxBytes),
-        remaining: Number(
-          lazy.IPPEnrollAndEntitleManager.entitlement?.maxBytes
-        ),
-        reset: null,
-      };
     }
 
     return null;