No Issue - Restore AppConstants to a state more akin to base esr52 and provide hardcoded values for things we no longer have.

* This will allow any third party code that is using this abomination to get what it expects.
* This also throws a deprecation warning except for Interlink where it is still heavily used for the moment.

1 files changed, 75 insertions, 77 deletions

diff --git a/modules/AppConstants.jsm b/modules/AppConstants.jsm
index cb6d776ee..cbffc4719 100644
--- a/modules/AppConstants.jsm
+++ b/modules/AppConstants.jsm
@@ -9,6 +9,13 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Services", "resource://gre/modules/Services.jsm");
 
+#ifndef BINOC_MAIL
+XPCOMUtils.defineLazyModuleGetter(this, "Deprecated", "resource://gre/modules/Deprecated.jsm");
+Deprecated.warning("AppConstants.jsm is deprecated and should not be trusted for accurate" +
+                   "application or platform state information.",
+                   "http://developer.palemoon.org/");
+#endif
+
 this.EXPORTED_SYMBOLS = ["AppConstants"];
 
 // Immutable for export.
@@ -35,22 +42,13 @@ this.AppConstants = Object.freeze({
 #else
   false,
 #endif
-
-  // Official corresponds to whether this build is considered an
-  // official, branded release for the public. You should
-  // disable developer-only functionality when this flag is set.
-  // MOZILLA_OFFICIAL is deprecated but kept for extension compatibility.
-  MOZILLA_OFFICIAL:
+  
 #ifdef MC_OFFICIAL
-  true,
+  MOZILLA_OFFICIAL: true,
+  MC_OFFICIAL: true,
 #else
-  false,
-#endif
-  MC_OFFICIAL:
-#ifdef MC_OFFICIAL
-  true,
-#else
-  false,
+  MOZILLA_OFFICIAL: false,
+  MC_OFFICIAL: false,
 #endif
 
   MOZ_OFFICIAL_BRANDING:
@@ -60,11 +58,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  MOZ_SERVICES_HEALTHREPORT: false,
-  MOZ_DATA_REPORTING: false,
-  MOZ_TELEMETRY_REPORTING: false,
-  MOZ_TELEMETRY_ON_BY_DEFAULT: false,
-
   MOZ_UPDATER:
 #ifdef MOZ_UPDATER
   true,
@@ -72,13 +65,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  MOZ_SWITCHBOARD:
-#ifdef MOZ_SWITCHBOARD
-  true,
-#else
-  false,
-#endif
-
   MOZ_WIDGET_GTK:
 #ifdef MOZ_WIDGET_GTK
   true,
@@ -93,36 +79,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  platform:
-#ifdef MOZ_WIDGET_GTK
-  "linux",
-#elif XP_WIN
-  "win",
-#elif XP_LINUX
-  "linux",
-#else
-  "other",
-#endif
-
-  isPlatformAndVersionAtLeast(platform, version) {
-    let platformVersion = Services.sysinfo.getProperty("version");
-    return platform == this.platform &&
-           Services.vc.compare(platformVersion, version) >= 0;
-  },
-
-  isPlatformAndVersionAtMost(platform, version) {
-    let platformVersion = Services.sysinfo.getProperty("version");
-    return platform == this.platform &&
-           Services.vc.compare(platformVersion, version) <= 0;
-  },
-
-  MOZ_VERIFY_MAR_SIGNATURE:
-#ifdef MOZ_VERIFY_MAR_SIGNATURE
-  true,
-#else
-  false,
-#endif
-
   DEBUG:
 #ifdef DEBUG
   true,
@@ -165,27 +121,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  DLL_PREFIX: "@DLL_PREFIX@",
-  DLL_SUFFIX: "@DLL_SUFFIX@",
-
-  MOZ_APP_NAME: "@MOZ_APP_NAME@",
-  MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
-  MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@",
-
-  MOZ_BUILD_APP:
-#ifdef MOZ_PHOENIX
-  "browser",
-#else
-  "@MOZ_BUILD_APP@",
-#endif
-
-  MOZ_MACBUNDLE_NAME: "@MOZ_MACBUNDLE_NAME@",
-  MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
-  INSTALL_LOCALE: "@AB_CD@",
-  MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
-
-  DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
-
   // URL to the hg revision this was built from (e.g.
   // "https://hg.mozilla.org/mozilla-central/rev/6256ec9113c1")
   // On unofficial builds, this is an empty string.
@@ -207,4 +142,67 @@ this.AppConstants = Object.freeze({
 #else
     false,
 #endif
+
+  DLL_PREFIX: "@DLL_PREFIX@",
+  DLL_SUFFIX: "@DLL_SUFFIX@",
+
+  MOZ_APP_NAME: "@MOZ_APP_NAME@",
+  MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
+  MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@",
+  MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
+  MOZ_MACBUNDLE_NAME: "FakeMacBundleName.app",
+  MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
+  INSTALL_LOCALE: "@AB_CD@",
+  MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
+  ANDROID_PACKAGE_NAME: "name.package.android.fake",
+  MOZ_B2G_VERSION: "2.6.0.0-prerelease",
+  MOZ_B2G_OS_NAME: "Boot2Failure",
+
+  DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
+
+  MOZ_DEV_EDITION: false,
+  MOZ_SERVICES_HEALTHREPORT: false,
+  MOZ_DATA_REPORTING: false,
+  MOZ_SANDBOX: false,
+  MOZ_CONTENT_SANDBOX: false,
+  MOZ_TELEMETRY_REPORTING: false,
+  MOZ_TELEMETRY_ON_BY_DEFAULT: false,
+  MOZ_SERVICES_CLOUDSYNC: false,
+  MOZ_SWITCHBOARD: false,
+  MOZ_WEBRTC: false,
+  MOZ_B2G: false,
+  MOZ_CRASHREPORTER: false,
+  MOZ_VERIFY_MAR_SIGNATURE: false,
+  MOZ_MAINTENANCE_SERVICE: false,
+  E10S_TESTING_ONLY: false,
+  MOZ_B2G_RIL: false,
+  MOZ_GRAPHENE: false,
+  MOZ_SYSTEM_NSS: false,
+  MOZ_REQUIRE_SIGNING: false,
+  MOZ_ANDROID_HISTORY: false,
+  MOZ_ENABLE_PROFILER_SPS: false,
+  MOZ_ANDROID_ACTIVITY_STREAM: false,
+
+  platform:
+#ifdef MOZ_WIDGET_GTK
+  "linux",
+#elif XP_WIN
+  "win",
+#elif XP_LINUX
+  "linux",
+#else
+  "other",
+#endif
+
+  isPlatformAndVersionAtLeast(platform, version) {
+    let platformVersion = Services.sysinfo.getProperty("version");
+    return platform == this.platform &&
+           Services.vc.compare(platformVersion, version) >= 0;
+  },
+
+  isPlatformAndVersionAtMost(platform, version) {
+    let platformVersion = Services.sysinfo.getProperty("version");
+    return platform == this.platform &&
+           Services.vc.compare(platformVersion, version) <= 0;
+  },
 });