From 9626500a0ecefde76411b60aeb54051cfdbc90c4 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sat, 3 Mar 2018 21:26:56 +0100
Subject: Remove testing-only UI components for e10s

This removes front-end tools only applicable for testing e10s (open non-e10s window, etc.)
This resolves #37
---
 toolkit/modules/AppConstants.jsm | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'toolkit/modules')

diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 8d9fa103c..ba5d82c01 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -204,13 +204,6 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
-  E10S_TESTING_ONLY:
-#ifdef E10S_TESTING_ONLY
-  true,
-#else
-  false,
-#endif
-
   DEBUG:
 #ifdef DEBUG
   true,
-- 
cgit v1.2.3


From d2a0a16054771b4b0bee38ee7241a976bc1dac75 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 1 Nov 2017 02:42:25 +0100
Subject: Hard-disable the use of sponsored tiles.

---
 toolkit/modules/NewTabUtils.jsm | 5 +++++
 toolkit/modules/moz.build       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'toolkit/modules')

diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index df8dae89d..e452a6fb2 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -249,10 +249,15 @@ var AllPages = {
    * Returns whether the history tiles are enhanced.
    */
   get enhanced() {
+#ifdef MC_BASILISK
+    // Hard-block the use of sponsored tiles.
+    return false;
+#else
     if (this._enhanced === null)
       this._enhanced = Services.prefs.getBoolPref(PREF_NEWTAB_ENHANCED);
 
     return this._enhanced;
+#endif
   },
 
   /**
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 257741274..60f3cc3da 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -57,7 +57,6 @@ EXTRA_JS_MODULES += [
     'Locale.jsm',
     'Log.jsm',
     'Memory.jsm',
-    'NewTabUtils.jsm',
     'NLP.jsm',
     'ObjectUtils.jsm',
     'PageMenu.jsm',
@@ -104,6 +103,8 @@ EXTRA_JS_MODULES += [
 EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
 EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
 
+EXTRA_PP_JS_MODULES += ['NewTabUtils.jsm']
+
 if not CONFIG['MOZ_WEBEXTENSIONS']:
   EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']
 
-- 
cgit v1.2.3