From b4e843aa3c58105a69f6473350da60fe4d49438c Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 4 Apr 2018 10:35:19 +0200
Subject: Change embedded emoji font from EmojiOne to Twemoji.

---
 toolkit/content/license.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 99ee42fde..45889a191 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -87,7 +87,7 @@
       <li><a href="about:license#dtoa">dtoa License</a></li>
       <li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary License</a></li>
 #if defined(XP_WIN) || defined(XP_LINUX)
-      <li><a href="about:license#emojione">EmojiOne License</a></li>
+      <li><a href="about:license#twemoji">Twemoji License</a></li>
 #endif
       <li><a href="about:license#hunspell-ee">Estonian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#expat">Expat License</a></li>
@@ -2911,14 +2911,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <hr>
 
 #if defined(XP_WIN) || defined(XP_LINUX)
-    <h1><a id="emojione"></a>EmojiOne License</h1>
+    <h1><a id="twemoji"></a>Twemoji License</h1>
 
     <p>This license applies to the emoji art contained within the bundled
 emoji font file.</p>
 
 <pre>
-Copyright (c) 2016 Ranks.com Inc.
-Copyright (c) 2014 Twitter, Inc and other contributors.
+Copyright (c) 2018 Twitter, Inc and other contributors.
 
 Creative Commons Attribution 4.0 International (CC BY 4.0)
 
-- 
cgit v1.2.3


From 940f4a53a5c4631aee021920019b0113239ddf14 Mon Sep 17 00:00:00 2001
From: trav90 <travawine@protonmail.ch>
Date: Wed, 4 Apr 2018 16:09:02 -0500
Subject: Remove extra "+" signs from jar.nm for Linux theme

---
 toolkit/themes/linux/mozapps/jar.mn | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index d4997d36c..89e6912d4 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -23,29 +23,29 @@ toolkit.jar:
 * skin/classic/mozapps/extensions/newaddon.css             (webextensions/newaddon.css)
   skin/classic/mozapps/extensions/heart.png                (webextensions/heart.png)
 #else
-+ skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
-+ skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
-+ skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
-+ skin/classic/mozapps/extensions/category-languages.png   (extensions/localeGeneric.png)
-+ skin/classic/mozapps/extensions/category-extensions.png  (extensions/extensionGeneric.png)
-+ skin/classic/mozapps/extensions/category-themes.png      (extensions/themeGeneric.png)
-+ skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
-+ skin/classic/mozapps/extensions/category-service.png     (extensions/category-service.png)
-+ skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png)
-+ skin/classic/mozapps/extensions/category-experiments.png (extensions/category-experiments.png)
-+ skin/classic/mozapps/extensions/category-recent.png      (extensions/category-recent.png)
-+ skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
-+ skin/classic/mozapps/extensions/extensionGeneric.png     (extensions/extensionGeneric.png)
-+ skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
-+ skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
-+ skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
-+ skin/classic/mozapps/extensions/experimentGeneric.png    (extensions/experimentGeneric.png)
-+ skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
-+ skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
-+ skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
-+ skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
-+ skin/classic/mozapps/extensions/selectAddons.css         (extensions/selectAddons.css)
-+ skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png  (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
+  skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-languages.png   (extensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/category-extensions.png  (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/category-themes.png      (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png     (extensions/category-service.png)
+  skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png)
+  skin/classic/mozapps/extensions/category-experiments.png (extensions/category-experiments.png)
+  skin/classic/mozapps/extensions/category-recent.png      (extensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
+  skin/classic/mozapps/extensions/extensionGeneric.png     (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png    (extensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
+  skin/classic/mozapps/extensions/selectAddons.css         (extensions/selectAddons.css)
+  skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png  (extensions/extensionGeneric.png)
 #endif
   skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
-- 
cgit v1.2.3


From 86f601589431c500a1a299000a3eac34d5b0247d Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Thu, 5 Apr 2018 10:11:55 +0200
Subject: Remove unused XRE_DONT_SUPPORT_XPSP2

---
 toolkit/xre/nsWindowsWMain.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
index 788d25a90..e282374cc 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -18,10 +18,6 @@
 #include "nsSetDllDirectory.h"
 #endif
 
-#if defined(__GNUC__)
-#define XRE_DONT_SUPPORT_XPSP2
-#endif
-
 #ifdef __MINGW32__
 
 /* MingW currently does not implement a wide version of the
-- 
cgit v1.2.3


From 5593323410b2373ef7c4abcc4826d85e573a13fc Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 5 Apr 2018 06:02:02 -0400
Subject: Take the following project_flags out of moz.configure: and put them
 back into old-configure

MOZ_PLACES
MOZ_SOCIAL
MOZ_SERVICES_HEALTHREPORT
MOZ_SERVICES_SYNC
MOZ_SERVICES_CLOUDSYNC
---
 toolkit/moz.configure | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 4717af022..c1e0880c9 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -444,34 +444,10 @@ def omnijar_name(toolkit):
 
 set_config('OMNIJAR_NAME', omnijar_name)
 
-project_flag('MOZ_PLACES',
-             help='Build Places if required',
-             set_as_define=True)
-
-project_flag('MOZ_SOCIAL',
-             help='Build SocialAPI if required',
-             default=True)
-
-project_flag('MOZ_SERVICES_HEALTHREPORT',
-             help='Build Firefox Health Reporter Service',
-             set_for_old_configure=True,
-             set_as_define=True)
-
-project_flag('MOZ_SERVICES_SYNC',
-             help='Build Sync Services if required')
-
-project_flag('MOZ_SERVICES_CLOUDSYNC',
-             help='Build Services/CloudSync if required')
-
 project_flag('MOZ_ANDROID_HISTORY',
              help='Enable Android History instead of Places',
              set_as_define=True)
 
-@depends('MOZ_PLACES', 'MOZ_ANDROID_HISTORY')
-def check_places_and_android_history(places, android_history):
-    if places and android_history:
-        die('Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.')
-
 # Permissions system
 # ==============================================================
 option(name='--disable-permissions',
-- 
cgit v1.2.3


From 5e8e0689c44562dcd7cb212e7c85085278426e9d Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 5 Apr 2018 09:31:09 -0400
Subject: Port over logopage

---
 toolkit/content/jar.mn         |  1 +
 toolkit/content/logopage.xhtml | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 toolkit/content/logopage.xhtml

(limited to 'toolkit')

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 0a0f0253b..f1a222a58 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -55,6 +55,7 @@ toolkit.jar:
    content/global/filepicker.properties
    content/global/globalOverlay.js
    content/global/mozilla.xhtml
+   content/global/logopage.xhtml
    content/global/process-content.js
    content/global/resetProfile.css
    content/global/resetProfile.js
diff --git a/toolkit/content/logopage.xhtml b/toolkit/content/logopage.xhtml
new file mode 100644
index 000000000..bcf1da0f0
--- /dev/null
+++ b/toolkit/content/logopage.xhtml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
+]>
+
+<!-- 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/. -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title></title>
+  <style type="text/css">
+  body {
+    background: Menu;
+    color: MenuText;
+  }
+  
+  img {
+    text-align: center;
+    position: absolute;
+    margin: auto;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    opacity: 0.2;
+  }
+  </style>
+</head>
+
+<body>
+  <img src="about:logo" alt=""/>
+</body>
+</html>
-- 
cgit v1.2.3


From 1b846d4b523821d743cee212943cec078e7280cd Mon Sep 17 00:00:00 2001
From: trav90 <travawine@protonmail.ch>
Date: Fri, 6 Apr 2018 14:37:18 -0500
Subject: Only add -Wno-null-conversion when building with clang

Fixes some GCC warning spam.
---
 toolkit/components/protobuf/moz.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'toolkit')

diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build
index b5015eb67..8cca3514c 100644
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -117,10 +117,13 @@ DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
 # Suppress warnings in third-party code.
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
-        '-Wno-null-conversion',
         '-Wno-return-type',
         '-Wno-sign-compare',
     ]
+    if CONFIG['CLANG_CXX']:
+        CXXFLAGS += [
+            '-Wno-null-conversion',
+        ]
 elif CONFIG['_MSC_VER']:
     CXXFLAGS += [
         '-wd4005', # 'WIN32_LEAN_AND_MEAN' : macro redefinition
-- 
cgit v1.2.3


From 987d105f55fd38dde9c9117e1946dc48bfe4c1dc Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 7 Apr 2018 03:29:35 -0400
Subject: [WebExAM] Use a special "platform" ID and version number for
 WebExtensions in XPIProvider.jsm

---
 toolkit/mozapps/webextensions/internal/XPIProvider.jsm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/mozapps/webextensions/internal/XPIProvider.jsm b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
index 87e09cef1..7c3cb6763 100644
--- a/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
@@ -175,6 +175,8 @@ const RDFURI_INSTALL_MANIFEST_ROOT    = "urn:mozilla:install-manifest";
 const PREFIX_NS_EM                    = "http://www.mozilla.org/2004/em-rdf#";
 
 const TOOLKIT_ID                      = "toolkit@mozilla.org";
+const WEBEXTENSIONS_ID                = "webextensions@mozilla.org";
+const WEBEXTENSIONS_VERSION           = "52.0";
 
 const XPI_SIGNATURE_CHECK_PERIOD      = 24 * 60 * 60;
 
@@ -1037,7 +1039,7 @@ var loadManifestFromWebManifest = Task.async(function*(aUri) {
   delete addon.defaultLocale.locales;
 
   addon.targetApplications = [{
-    id: TOOLKIT_ID,
+    id: WEBEXTENSIONS_ID,
     minVersion: bss.strict_min_version,
     maxVersion: bss.strict_max_version,
   }];
@@ -7228,6 +7230,8 @@ AddonInternal.prototype = {
       version = aAppVersion;
     else if (app.id == TOOLKIT_ID)
       version = aPlatformVersion
+    else if (app.id == WEBEXTENSIONS_ID)
+      version = WEBEXTENSIONS_VERSION
 
     // Only extensions and dictionaries can be compatible by default; themes
     // and language packs always use strict compatibility checking.
@@ -7250,7 +7254,7 @@ AddonInternal.prototype = {
       let minCompatVersion;
       if (app.id == Services.appinfo.ID)
         minCompatVersion = XPIProvider.minCompatibleAppVersion;
-      else if (app.id == TOOLKIT_ID)
+      else if (app.id == TOOLKIT_ID || app.id == WEBEXTENSIONS_ID)
         minCompatVersion = XPIProvider.minCompatiblePlatformVersion;
 
       if (minCompatVersion &&
@@ -7269,7 +7273,7 @@ AddonInternal.prototype = {
     for (let targetApp of this.targetApplications) {
       if (targetApp.id == Services.appinfo.ID)
         return targetApp;
-      if (targetApp.id == TOOLKIT_ID)
+      if (targetApp.id == TOOLKIT_ID || targetApp.id == WEBEXTENSIONS_ID)
         app = targetApp;
     }
     return app;
-- 
cgit v1.2.3


From fb84e0f3226f1b9233aa2a6bfc55c38110694ffd Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 7 Apr 2018 06:10:48 -0400
Subject: Make about:logopage available to any browser that opts into
 MOZ_PHOENIX

Follow up to 5e8e0689c
---
 toolkit/content/jar.mn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'toolkit')

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index f1a222a58..b80838835 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -55,7 +55,9 @@ toolkit.jar:
    content/global/filepicker.properties
    content/global/globalOverlay.js
    content/global/mozilla.xhtml
+#ifdef MOZ_PHOENIX
    content/global/logopage.xhtml
+#endif
    content/global/process-content.js
    content/global/resetProfile.css
    content/global/resetProfile.js
-- 
cgit v1.2.3


From eb09a5738ccdc46202b597570a878d72f22b16b0 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 7 Apr 2018 08:22:56 -0400
Subject: Make code style consistent across all AboutRedirector's

---
 toolkit/content/jar.mn         |  2 ++
 toolkit/content/memoriam.xhtml | 76 ++++++++++++++++++++++++++++++++++++++++++
 toolkit/content/mozilla.css    | 36 ++++++++++++++++++++
 toolkit/content/mozilla.xhtml  | 35 ++-----------------
 4 files changed, 116 insertions(+), 33 deletions(-)
 create mode 100644 toolkit/content/memoriam.xhtml
 create mode 100644 toolkit/content/mozilla.css

(limited to 'toolkit')

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index b80838835..946e499f1 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -54,6 +54,8 @@ toolkit.jar:
 #endif
    content/global/filepicker.properties
    content/global/globalOverlay.js
+   content/global/memoriam.xhtml
+*   content/global/mozilla.css
    content/global/mozilla.xhtml
 #ifdef MOZ_PHOENIX
    content/global/logopage.xhtml
diff --git a/toolkit/content/memoriam.xhtml b/toolkit/content/memoriam.xhtml
new file mode 100644
index 000000000..f1a1b474d
--- /dev/null
+++ b/toolkit/content/memoriam.xhtml
@@ -0,0 +1,76 @@
+<!DOCTYPE html
+[
+  <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
+  %directionDTD;
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+]>
+
+<!-- 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/. -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset='utf-8' />
+    <title>Mozilla: In Memoriam</title>
+
+<style>
+html {
+  background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
+  color: white;
+  font-style: italic;
+  text-rendering: optimizeLegibility;
+  min-height: 100%;
+}
+
+#moztext {
+  margin-top: 15%;
+  font-size: 1.1em;
+  font-family: serif;
+  text-align: center;
+  line-height: 1.5;
+}
+
+#from {
+  font-size: 1.0em;
+  font-family: serif;
+  text-align: right;
+}
+
+em {
+  font-size: 1.3em;
+  line-height: 0;
+}
+
+a {
+  text-decoration: none;
+  color: white;
+}
+</style>
+</head>
+
+<body dir="&locale.dir;">
+
+<section>
+  <p id="moztext">
+  <h1>Mozilla: In Memoriam</h1>
+  <br/>
+  Dedicated to the tireless developers who have come and gone.<br/>
+  To those who have put their heart and soul into Mozilla products.<br/>
+  To those who have seen their good intentions and hard work squandered.<br/>
+  To those who really cared about the user, and cared about usability.<br/>
+  To those who truly understood us and desired freedom, but were unheard.<br/>
+  To those who knew that change is inevitable, but loss of vision is not.<br/>
+  To those who were forced to give up the good fight.<br/>
+  <br/>
+  <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
+  <br/>
+  </p>
+
+  <p id="from">
+  </p>
+</section>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/toolkit/content/mozilla.css b/toolkit/content/mozilla.css
new file mode 100644
index 000000000..d5eae6415
--- /dev/null
+++ b/toolkit/content/mozilla.css
@@ -0,0 +1,36 @@
+html {
+%ifdef MC_PALEMOON
+  background: #333399 radial-gradient( circle at 75% 25%, #6666b0 0%, #333399 40%, #111177 80%) center center / cover no-repeat;
+%else
+  background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
+%endif
+
+  color: white;
+  font-style: italic;
+  text-rendering: optimizeLegibility;
+  min-height: 100%;
+}
+
+#moztext {
+  margin-top: 15%;
+  font-size: 1.1em;
+  font-family: serif;
+  text-align: center;
+  line-height: 1.5;
+}
+
+#from {
+  font-size: 1.95em;
+  font-family: serif;
+  text-align: right;
+}
+
+em {
+  font-size: 1.3em;
+  line-height: 0;
+}
+
+a {
+  text-decoration: none;
+  color: white;
+}
\ No newline at end of file
diff --git a/toolkit/content/mozilla.xhtml b/toolkit/content/mozilla.xhtml
index 2acfc9f5d..8c79b5ff9 100644
--- a/toolkit/content/mozilla.xhtml
+++ b/toolkit/content/mozilla.xhtml
@@ -15,39 +15,8 @@
     <meta charset='utf-8' />
     <title>&chronicles.title.55.2;</title>
 
-<style>
-html {
-  background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
-  color: white;
-  font-style: italic;
-  text-rendering: optimizeLegibility;
-  min-height: 100%;
-}
-
-#moztext {
-  margin-top: 15%;
-  font-size: 1.1em;
-  font-family: serif;
-  text-align: center;
-  line-height: 1.5;
-}
-
-#from {
-  font-size: 1.95em;
-  font-family: serif;
-  text-align: right;
-}
-
-em {
-  font-size: 1.3em;
-  line-height: 0;
-}
-
-a {
-  text-decoration: none;
-  color: white;
-}
-</style>
+    <link rel="stylesheet" href="chrome://global/content/mozilla.css"
+          type="text/css"/>
 </head>
 
 <body dir="&locale.dir;">
-- 
cgit v1.2.3


From bf6bb142fc5bcb49b053788e06160af304f639e5 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 8 Apr 2018 12:24:27 +0200
Subject: Remove telemetry experiments framework

---
 .../components/telemetry/TelemetryEnvironment.jsm  |  30 +-
 toolkit/content/aboutSupport.xhtml                 |  33 --
 toolkit/modules/Troubleshoot.jsm                   |  19 -
 toolkit/mozapps/extensions/content/extensions.js   |  81 +--
 .../extensions/test/browser/browser_experiments.js | 645 --------------------
 .../mozapps/webextensions/content/extensions.js    |  84 ---
 .../test/browser/browser_experiments.js            | 654 ---------------------
 7 files changed, 2 insertions(+), 1544 deletions(-)
 delete mode 100644 toolkit/mozapps/extensions/test/browser/browser_experiments.js
 delete mode 100644 toolkit/mozapps/webextensions/test/browser/browser_experiments.js

(limited to 'toolkit')

diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm
index 2f4ac81ba..910d804ae 100644
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -153,7 +153,6 @@ const DEFAULT_ENVIRONMENT_PREFS = new Map([
   ["dom.ipc.plugins.enabled", {what: RECORD_PREF_VALUE}],
   ["dom.ipc.processCount", {what: RECORD_PREF_VALUE, requiresRestart: true}],
   ["dom.max_script_run_time", {what: RECORD_PREF_VALUE}],
-  ["experiments.manifest.uri", {what: RECORD_PREF_VALUE}],
   ["extensions.autoDisableScopes", {what: RECORD_PREF_VALUE}],
   ["extensions.enabledScopes", {what: RECORD_PREF_VALUE}],
   ["extensions.blocklist.enabled", {what: RECORD_PREF_VALUE}],
@@ -209,7 +208,6 @@ const PREF_E10S_COHORT = "e10s.rollout.cohort";
 
 const COMPOSITOR_CREATED_TOPIC = "compositor:created";
 const DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC = "distribution-customization-complete";
-const EXPERIMENTS_CHANGED_TOPIC = "experiments-changed";
 const GFX_FEATURES_READY_TOPIC = "gfx-features-ready";
 const SEARCH_ENGINE_MODIFIED_TOPIC = "browser-search-engine-modified";
 const SEARCH_SERVICE_TOPIC = "browser-search-service";
@@ -465,7 +463,6 @@ EnvironmentAddonBuilder.prototype = {
   watchForChanges: function() {
     this._loaded = true;
     AddonManager.addAddonListener(this);
-    Services.obs.addObserver(this, EXPERIMENTS_CHANGED_TOPIC, false);
   },
 
   // AddonListener
@@ -490,7 +487,6 @@ EnvironmentAddonBuilder.prototype = {
   // nsIObserver
   observe: function (aSubject, aTopic, aData) {
     this._environment._log.trace("observe - Topic " + aTopic);
-    this._checkForChanges("experiment-changed");
   },
 
   _checkForChanges: function(changeReason) {
@@ -515,7 +511,6 @@ EnvironmentAddonBuilder.prototype = {
   _shutdownBlocker: function() {
     if (this._loaded) {
       AddonManager.removeAddonListener(this);
-      Services.obs.removeObserver(this, EXPERIMENTS_CHANGED_TOPIC);
     }
     return this._pendingTask;
   },
@@ -545,7 +540,6 @@ EnvironmentAddonBuilder.prototype = {
       theme: yield this._getActiveTheme(),
       activePlugins: this._getActivePlugins(),
       activeGMPlugins: yield this._getActiveGMPlugins(),
-      activeExperiment: this._getActiveExperiment(),
       persona: personaId,
     };
 
@@ -718,29 +712,7 @@ EnvironmentAddonBuilder.prototype = {
     }
 
     return activeGMPlugins;
-  }),
-
-  /**
-   * Get the active experiment data in object form.
-   * @return Object containing the active experiment data.
-   */
-  _getActiveExperiment: function () {
-    let experimentInfo = {};
-    try {
-      let scope = {};
-      Cu.import("resource:///modules/experiments/Experiments.jsm", scope);
-      let experiments = scope.Experiments.instance();
-      let activeExperiment = experiments.getActiveExperimentID();
-      if (activeExperiment) {
-        experimentInfo.id = activeExperiment;
-        experimentInfo.branch = experiments.getActiveExperimentBranch();
-      }
-    } catch (e) {
-      // If this is not Firefox, the import will fail.
-    }
-
-    return experimentInfo;
-  },
+  })
 };
 
 function EnvironmentCache() {
diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
index e2885c8b8..a043dfe3b 100644
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -504,39 +504,6 @@
       </table>
 
 
-      <h2 class="major-section">
-        &aboutSupport.experimentsTitle;
-      </h2>
-
-      <table>
-        <thead>
-          <tr>
-            <th>
-              &aboutSupport.experimentName;
-            </th>
-            <th>
-              &aboutSupport.experimentId;
-            </th>
-            <th>
-              &aboutSupport.experimentDescription;
-            </th>
-            <th>
-              &aboutSupport.experimentActive;
-            </th>
-            <th>
-              &aboutSupport.experimentEndDate;
-            </th>
-            <th>
-              &aboutSupport.experimentHomepage;
-            </th>
-            <th>
-              &aboutSupport.experimentBranch;
-            </th>
-          </tr>
-        </thead>
-        <tbody id="experiments-tbody">
-        </tbody>
-      </table>
       <!-- - - - - - - - - - - - - - - - - - - - - -->
 
 #if defined(MOZ_SANDBOX)
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index cc545b4c4..f259d9ae9 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -12,13 +12,6 @@ Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AppConstants.jsm");
 
-var Experiments;
-try {
-  Experiments = Cu.import("resource:///modules/experiments/Experiments.jsm").Experiments;
-}
-catch (e) {
-}
-
 // We use a preferences whitelist to make sure we only show preferences that
 // are useful for support and won't compromise the user's privacy.  Note that
 // entries are *prefixes*: for example, "accessibility." applies to all prefs
@@ -263,18 +256,6 @@ var dataProviders = {
     });
   },
 
-  experiments: function experiments(done) {
-    if (Experiments === undefined) {
-      done([]);
-      return;
-    }
-
-    // getExperiments promises experiment history
-    Experiments.instance().getExperiments().then(
-      experiments => done(experiments)
-    );
-  },
-
   modifiedPreferences: function modifiedPreferences(done) {
     done(getPrefList(name => Services.prefs.prefHasUserValue(name)));
   },
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index a799eeebb..1d8d5bb0a 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -22,8 +22,6 @@ XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function () {
   return Cu.import("resource://gre/modules/devtools/ToolboxProcess.jsm", {}).
          BrowserToolboxProcess;
 });
-XPCOMUtils.defineLazyModuleGetter(this, "Experiments",
-  "resource:///modules/experiments/Experiments.jsm");
 
 const PREF_DISCOVERURL = "extensions.webservice.discoverURL";
 const PREF_DISCOVER_ENABLED = "extensions.getAddons.showPane";
@@ -216,23 +214,6 @@ function isDiscoverEnabled() {
   return true;
 }
 
-function getExperimentEndDate(aAddon) {
-  if (!("@mozilla.org/browser/experiments-service;1" in Cc)) {
-    return 0;
-  }
-
-  if (!aAddon.isActive) {
-    return aAddon.endDate;
-  }
-
-  let experiment = Experiments.instance().getActiveExperiment();
-  if (!experiment) {
-    return 0;
-  }
-
-  return experiment.endDate;
-}
-
 /**
  * Obtain the main DOMWindow for the current context.
  */
@@ -1316,28 +1297,7 @@ var gViewController = {
       doCommand: function cmd_neverActivateItem_doCommand(aAddon) {
         aAddon.userDisabled = true;
       }
-    },
-
-    cmd_experimentsLearnMore: {
-      isEnabled: function cmd_experimentsLearnMore_isEnabled() {
-        let mainWindow = getMainWindow();
-        return mainWindow && "switchToTabHavingURI" in mainWindow;
-      },
-      doCommand: function cmd_experimentsLearnMore_doCommand() {
-        let url = Services.prefs.getCharPref("toolkit.telemetry.infoURL");
-        openOptionsInTab(url);
-      },
-    },
-
-    cmd_experimentsOpenTelemetryPreferences: {
-      isEnabled: function cmd_experimentsOpenTelemetryPreferences_isEnabled() {
-        return !!getMainWindowWithPreferencesPane();
-      },
-      doCommand: function cmd_experimentsOpenTelemetryPreferences_doCommand() {
-        let mainWindow = getMainWindowWithPreferencesPane();
-        mainWindow.openAdvancedPreferences("dataChoicesTab");
-      },
-    },
+    }
   },
 
   supportsCommand: function gVC_supportsCommand(aCommand) {
@@ -1468,10 +1428,6 @@ function createItem(aObj, aIsInstall, aIsRemote) {
   // the binding handles the rest
   item.setAttribute("value", aObj.id);
 
-  if (aObj.type == "experiment") {
-    item.endDate = getExperimentEndDate(aObj);
-  }
-
   return item;
 }
 
@@ -2679,13 +2635,6 @@ var gListView = {
     // the existing item
     if (aInstall.existingAddon)
       this.removeItem(aInstall, true);
-
-    if (aInstall.addon.type == "experiment") {
-      let item = this.getListItemForID(aInstall.addon.id);
-      if (item) {
-        item.endDate = getExperimentEndDate(aInstall.addon);
-      }
-    }
   },
 
   addItem: function gListView_addItem(aObj, aIsInstall) {
@@ -2945,34 +2894,6 @@ var gDetailView = {
       }
     }
 
-    if (this._addon.type == "experiment") {
-      let prefix = "details.experiment.";
-      let active = this._addon.isActive;
-
-      let stateKey = prefix + "state." + (active ? "active" : "complete");
-      let node = document.getElementById("detail-experiment-state");
-      node.value = gStrings.ext.GetStringFromName(stateKey);
-
-      let now = Date.now();
-      let end = getExperimentEndDate(this._addon);
-      let days = Math.abs(end - now) / (24 * 60 * 60 * 1000);
-
-      let timeKey = prefix + "time.";
-      let timeMessage;
-      if (days < 1) {
-        timeKey += (active ? "endsToday" : "endedToday");
-        timeMessage = gStrings.ext.GetStringFromName(timeKey);
-      } else {
-        timeKey += (active ? "daysRemaining" : "daysPassed");
-        days = Math.round(days);
-        let timeString = gStrings.ext.GetStringFromName(timeKey);
-        timeMessage = PluralForm.get(days, timeString)
-                                .replace("#1", days);
-      }
-
-      document.getElementById("detail-experiment-time").value = timeMessage;
-    }
-
     this.fillSettingsRows(aScrollToPreferences, (function updateView_fillSettingsRows() {
       this.updateState();
       gViewController.notifyViewChanged();
diff --git a/toolkit/mozapps/extensions/test/browser/browser_experiments.js b/toolkit/mozapps/extensions/test/browser/browser_experiments.js
deleted file mode 100644
index 72d0ca83e..000000000
--- a/toolkit/mozapps/extensions/test/browser/browser_experiments.js
+++ /dev/null
@@ -1,645 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-Components.utils.import("resource://gre/modules/Promise.jsm", this);
-
-let {AddonTestUtils} = Components.utils.import("resource://testing-common/AddonManagerTesting.jsm", {});
-let {HttpServer} = Components.utils.import("resource://testing-common/httpd.js", {});
-
-let gManagerWindow;
-let gCategoryUtilities;
-let gExperiments;
-let gHttpServer;
-
-let gSavedManifestURI;
-let gIsEnUsLocale;
-
-const SEC_IN_ONE_DAY = 24 * 60 * 60;
-const MS_IN_ONE_DAY  = SEC_IN_ONE_DAY * 1000;
-
-function getExperimentAddons() {
-  let deferred = Promise.defer();
-  AddonManager.getAddonsByTypes(["experiment"], (addons) => {
-    deferred.resolve(addons);
-  });
-  return deferred.promise;
-}
-
-function getInstallItem() {
-  let doc = gManagerWindow.document;
-  let view = doc.getElementById("view-port").selectedPanel;
-  let list = doc.getElementById("addon-list");
-
-  let node = list.firstChild;
-  while (node) {
-    if (node.getAttribute("status") == "installing") {
-      return node;
-    }
-    node = node.nextSibling;
-  }
-
-  return null;
-}
-
-function patchPolicy(policy, data) {
-  for (let key of Object.keys(data)) {
-    Object.defineProperty(policy, key, {
-      value: data[key],
-      writable: true,
-    });
-  }
-}
-
-function defineNow(policy, time) {
-  patchPolicy(policy, { now: () => new Date(time) });
-}
-
-function openDetailsView(aId) {
-  let item = get_addon_element(gManagerWindow, aId);
-  Assert.ok(item, "Should have got add-on element.");
-  is_element_visible(item, "Add-on element should be visible.");
-
-  EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow);
-  EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow);
-
-  let deferred = Promise.defer();
-  wait_for_view_load(gManagerWindow, deferred.resolve);
-  return deferred.promise;
-}
-
-function clickRemoveButton(addonElement) {
-  let btn = gManagerWindow.document.getAnonymousElementByAttribute(addonElement, "anonid", "remove-btn");
-  if (!btn) {
-    return Promise.reject();
-  }
-
-  EventUtils.synthesizeMouseAtCenter(btn, { clickCount: 1 }, gManagerWindow);
-  let deferred = Promise.defer();
-  setTimeout(deferred.resolve, 0);
-  return deferred;
-}
-
-function clickUndoButton(addonElement) {
-  let btn = gManagerWindow.document.getAnonymousElementByAttribute(addonElement, "anonid", "undo-btn");
-  if (!btn) {
-    return Promise.reject();
-  }
-
-  EventUtils.synthesizeMouseAtCenter(btn, { clickCount: 1 }, gManagerWindow);
-  let deferred = Promise.defer();
-  setTimeout(deferred.resolve, 0);
-  return deferred;
-}
-
-add_task(function* initializeState() {
-  gManagerWindow = yield open_manager();
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  registerCleanupFunction(() => {
-    Services.prefs.clearUserPref("experiments.enabled");
-    if (gHttpServer) {
-      gHttpServer.stop(() => {});
-      if (gSavedManifestURI !== undefined) {
-        Services.prefs.setCharPref("experments.manifest.uri", gSavedManifestURI);
-      }
-    }
-    if (gExperiments) {
-      let tmp = {};
-      Cu.import("resource:///modules/experiments/Experiments.jsm", tmp);
-      gExperiments._policy = new tmp.Experiments.Policy();
-    }
-  });
-
-  let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
-  gIsEnUsLocale = chrome.getSelectedLocale("global") == "en-US";
-
-  // The Experiments Manager will interfere with us by preventing installs
-  // of experiments it doesn't know about. We remove it from the equation
-  // because here we are only concerned with core Addon Manager operation,
-  // not the superset Experiments Manager has imposed.
-  if ("@mozilla.org/browser/experiments-service;1" in Components.classes) {
-    let tmp = {};
-    Cu.import("resource:///modules/experiments/Experiments.jsm", tmp);
-    // There is a race condition between XPCOM service initialization and
-    // this test running. We have to initialize the instance first, then
-    // uninitialize it to prevent this.
-    gExperiments = tmp.Experiments.instance();
-    yield gExperiments._mainTask;
-    yield gExperiments.uninit();
-  }
-});
-
-// On an empty profile with no experiments, the experiment category
-// should be hidden.
-add_task(function* testInitialState() {
-  Assert.ok(gCategoryUtilities.get("experiment", false), "Experiment tab is defined.");
-  Assert.ok(!gCategoryUtilities.isTypeVisible("experiment"), "Experiment tab hidden by default.");
-});
-
-add_task(function* testExperimentInfoNotVisible() {
-  yield gCategoryUtilities.openType("extension");
-  let el = gManagerWindow.document.getElementsByClassName("experiment-info-container")[0];
-  is_element_hidden(el, "Experiment info not visible on other types.");
-});
-
-// If we have an active experiment, we should see the experiments tab
-// and that tab should have some messages.
-add_task(function* testActiveExperiment() {
-  let addon = yield install_addon("addons/browser_experiment1.xpi");
-
-  Assert.ok(addon.userDisabled, "Add-on is disabled upon initial install.");
-  Assert.equal(addon.isActive, false, "Add-on is not active.");
-
-  Assert.ok(gCategoryUtilities.isTypeVisible("experiment"), "Experiment tab visible.");
-
-  yield gCategoryUtilities.openType("experiment");
-  let el = gManagerWindow.document.getElementsByClassName("experiment-info-container")[0];
-  is_element_visible(el, "Experiment info is visible on experiment tab.");
-});
-
-add_task(function* testExperimentLearnMore() {
-  // Actual URL is irrelevant.
-  Services.prefs.setCharPref("toolkit.telemetry.infoURL",
-                             "http://mochi.test:8888/server.js");
-
-  yield gCategoryUtilities.openType("experiment");
-  let btn = gManagerWindow.document.getElementById("experiments-learn-more");
-
-  if (!gUseInContentUI) {
-    is_element_hidden(btn, "Learn more button hidden if not using in-content UI.");
-    Services.prefs.clearUserPref("toolkit.telemetry.infoURL");
-
-    return;
-  }
-
-  is_element_visible(btn, "Learn more button visible.");
-
-  let deferred = Promise.defer();
-  window.addEventListener("DOMContentLoaded", function onLoad(event) {
-    info("Telemetry privacy policy window opened.");
-    window.removeEventListener("DOMContentLoaded", onLoad, false);
-
-    let browser = gBrowser.selectedBrowser;
-    let expected = Services.prefs.getCharPref("toolkit.telemetry.infoURL");
-    Assert.equal(browser.currentURI.spec, expected, "New tab should have loaded privacy policy.");
-    browser.contentWindow.close();
-
-    Services.prefs.clearUserPref("toolkit.telemetry.infoURL");
-
-    deferred.resolve();
-  }, false);
-
-  info("Opening telemetry privacy policy.");
-  EventUtils.synthesizeMouseAtCenter(btn, {}, gManagerWindow);
-
-  yield deferred.promise;
-});
-
-add_task(function* testOpenPreferences() {
-  yield gCategoryUtilities.openType("experiment");
-  let btn = gManagerWindow.document.getElementById("experiments-change-telemetry");
-  if (!gUseInContentUI) {
-    is_element_hidden(btn, "Change telemetry button not enabled in out of window UI.");
-    info("Skipping preferences open test because not using in-content UI.");
-    return;
-  }
-
-  is_element_visible(btn, "Change telemetry button visible in in-content UI.");
-
-  let deferred = Promise.defer();
-  Services.obs.addObserver(function observer(prefWin, topic, data) {
-    Services.obs.removeObserver(observer, "advanced-pane-loaded");
-    info("Advanced preference pane opened.");
-    executeSoon(function() {
-      // We want this test to fail if the preferences pane changes.
-      let el = prefWin.document.getElementById("dataChoicesPanel");
-      is_element_visible(el);
-
-      prefWin.close();
-      info("Closed preferences pane.");
-
-      deferred.resolve();
-    });
-  }, "advanced-pane-loaded", false);
-
-  info("Loading preferences pane.");
-  EventUtils.synthesizeMouseAtCenter(btn, {}, gManagerWindow);
-
-  yield deferred.promise;
-});
-
-add_task(function* testButtonPresence() {
-  yield gCategoryUtilities.openType("experiment");
-  let item = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "remove-btn");
-  // Corresponds to the uninstall permission.
-  is_element_visible(el, "Remove button is visible.");
-  // Corresponds to lack of disable permission.
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "disable-btn");
-  is_element_hidden(el, "Disable button not visible.");
-  // Corresponds to lack of enable permission.
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "enable-btn");
-  is_element_hidden(el, "Enable button not visible.");
-});
-
-// Remove the add-on we've been testing with.
-add_task(function* testCleanup() {
-  yield AddonTestUtils.uninstallAddonByID("test-experiment1@experiments.mozilla.org");
-  // Verify some conditions, just in case.
-  let addons = yield getExperimentAddons();
-  Assert.equal(addons.length, 0, "No experiment add-ons are installed.");
-});
-
-// The following tests should ideally live in browser/experiments/. However,
-// they rely on some of the helper functions from head.js, which can't easily
-// be consumed from other directories. So, they live here.
-
-add_task(function* testActivateExperiment() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  gHttpServer = new HttpServer();
-  gHttpServer.start(-1);
-  let root = "http://localhost:" + gHttpServer.identity.primaryPort + "/";
-  gHttpServer.registerPathHandler("/manifest", (request, response) => {
-    response.setStatusLine(null, 200, "OK");
-    response.write(JSON.stringify({
-      "version": 1,
-      "experiments": [
-        {
-          id: "experiment-1",
-          xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-          xpiHash: "IRRELEVANT",
-          startTime: Date.now() / 1000 - 3600,
-          endTime: Date.now() / 1000 + 3600,
-          maxActiveSeconds: 600,
-          appName: [Services.appinfo.name],
-          channel: [gExperiments._policy.updatechannel()],
-        },
-      ],
-    }));
-    response.processAsync();
-    response.finish();
-  });
-
-  gSavedManifestURI = Services.prefs.getCharPref("experiments.manifest.uri");
-  Services.prefs.setCharPref("experiments.manifest.uri", root + "manifest");
-
-  // We need to remove the cache file to help ensure consistent state.
-  yield OS.File.remove(gExperiments._cacheFilePath);
-
-  Services.prefs.setBoolPref("experiments.enabled", true);
-
-  info("Initializing experiments service.");
-  yield gExperiments.init();
-  info("Experiments service finished first run.");
-
-  // Check conditions, just to be sure.
-  let experiments = yield gExperiments.getExperiments();
-  Assert.equal(experiments.length, 0, "No experiments known to the service.");
-
-  // This makes testing easier.
-  gExperiments._policy.ignoreHashes = true;
-
-  info("Manually updating experiments manifest.");
-  yield gExperiments.updateManifest();
-  info("Experiments update complete.");
-
-  let deferred = Promise.defer();
-  gHttpServer.stop(() => {
-    gHttpServer = null;
-
-    info("getting experiment by ID");
-    AddonManager.getAddonByID("test-experiment1@experiments.mozilla.org", (addon) => {
-      Assert.ok(addon, "Add-on installed via Experiments manager.");
-
-      deferred.resolve();
-    });
-  });
-
-  yield deferred.promise;
-
-  Assert.ok(gCategoryUtilities.isTypeVisible, "experiment", "Experiment tab visible.");
-  yield gCategoryUtilities.openType("experiment");
-  let el = gManagerWindow.document.getElementsByClassName("experiment-info-container")[0];
-  is_element_visible(el, "Experiment info is visible on experiment tab.");
-});
-
-add_task(function testDeactivateExperiment() {
-  if (!gExperiments) {
-    return;
-  }
-
-  // Fake an empty manifest to purge data from previous manifest.
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [],
-  });
-
-  yield gExperiments.disableExperiment("testing");
-
-  // We should have a record of the previously-active experiment.
-  let experiments = yield gExperiments.getExperiments();
-  Assert.equal(experiments.length, 1, "1 experiment is known.");
-  Assert.equal(experiments[0].active, false, "Experiment is not active.");
-
-  // We should have a previous experiment in the add-ons manager.
-  let deferred = Promise.defer();
-  AddonManager.getAddonsByTypes(["experiment"], (addons) => {
-    deferred.resolve(addons);
-  });
-  let addons = yield deferred.promise;
-  Assert.equal(addons.length, 1, "1 experiment add-on known.");
-  Assert.ok(addons[0].appDisabled, "It is a previous experiment.");
-  Assert.equal(addons[0].id, "experiment-1", "Add-on ID matches expected.");
-
-  // Verify the UI looks sane.
-
-  Assert.ok(gCategoryUtilities.isTypeVisible("experiment"), "Experiment tab visible.");
-  let item = get_addon_element(gManagerWindow, "experiment-1");
-  Assert.ok(item, "Got add-on element.");
-  Assert.ok(!item.active, "Element should not be active.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  // User control buttons should not be present because previous experiments
-  // should have no permissions.
-  let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "remove-btn");
-  is_element_hidden(el, "Remove button is not visible.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "disable-btn");
-  is_element_hidden(el, "Disable button is not visible.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "enable-btn");
-  is_element_hidden(el, "Enable button is not visible.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "preferences-btn");
-  is_element_hidden(el, "Preferences button is not visible.");
-});
-
-add_task(function testActivateRealExperiments() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [
-      {
-        id: "experiment-2",
-        xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-        xpiHash: "IRRELEVANT",
-        startTime: Date.now() / 1000 - 3600,
-        endTime: Date.now() / 1000 + 3600,
-        maxActiveSeconds: 600,
-        appName: [Services.appinfo.name],
-        channel: [gExperiments._policy.updatechannel()],
-      },
-    ],
-  });
-  yield gExperiments._run();
-
-  // Check the active experiment.
-
-  let item = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Active");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Less than a day remaining");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "error-container");
-  is_element_hidden(el, "error-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "warning-container");
-  is_element_hidden(el, "warning-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "pending-container");
-  is_element_hidden(el, "pending-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "version");
-  is_element_hidden(el, "version should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "disabled-postfix");
-  is_element_hidden(el, "disabled-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "update-postfix");
-  is_element_hidden(el, "update-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-
-  // Check the previous experiment.
-
-  item = get_addon_element(gManagerWindow, "experiment-1");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Complete");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Less than a day ago");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "error-container");
-  is_element_hidden(el, "error-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "warning-container");
-  is_element_hidden(el, "warning-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "pending-container");
-  is_element_hidden(el, "pending-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "version");
-  is_element_hidden(el, "version should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "disabled-postfix");
-  is_element_hidden(el, "disabled-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "update-postfix");
-  is_element_hidden(el, "update-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-
-  // Install an "older" experiment.
-
-  yield gExperiments.disableExperiment("experiment-2");
-
-  let now = Date.now();
-  let fakeNow = now - 5 * MS_IN_ONE_DAY;
-  defineNow(gExperiments._policy, fakeNow);
-
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [
-      {
-        id: "experiment-3",
-        xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-        xpiHash: "IRRELEVANT",
-        startTime: fakeNow / 1000 - SEC_IN_ONE_DAY,
-        endTime: now / 1000 + 10 * SEC_IN_ONE_DAY,
-        maxActiveSeconds: 100 * SEC_IN_ONE_DAY,
-        appName: [Services.appinfo.name],
-        channel: [gExperiments._policy.updatechannel()],
-      },
-    ],
-  });
-  yield gExperiments._run();
-
-  // Check the active experiment.
-
-  item = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Active");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "10 days remaining");
-  }
-
-  // Disable it and check it's previous experiment entry.
-
-  yield gExperiments.disableExperiment("experiment-3");
-
-  item = get_addon_element(gManagerWindow, "experiment-3");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Complete");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "5 days ago");
-  }
-});
-
-add_task(function testDetailView() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  defineNow(gExperiments._policy, Date.now());
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [
-      {
-        id: "experiment-4",
-        xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-        xpiHash: "IRRELEVANT",
-        startTime: Date.now() / 1000 - 3600,
-        endTime: Date.now() / 1000 + 3600,
-        maxActiveSeconds: 600,
-        appName: [Services.appinfo.name],
-        channel: [gExperiments._policy.updatechannel()],
-      },
-    ],
-  });
-  yield gExperiments._run();
-
-  // Check active experiment.
-
-  yield openDetailsView("test-experiment1@experiments.mozilla.org");
-
-  let el = gManagerWindow.document.getElementById("detail-experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Active");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Less than a day remaining");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-version");
-  is_element_hidden(el, "detail-version should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-creator");
-  is_element_hidden(el, "detail-creator should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-
-  // Check previous experiment.
-
-  yield gCategoryUtilities.openType("experiment");
-  yield openDetailsView("experiment-3");
-
-  el = gManagerWindow.document.getElementById("detail-experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Complete");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "5 days ago");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-version");
-  is_element_hidden(el, "detail-version should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-creator");
-  is_element_hidden(el, "detail-creator should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-});
-
-add_task(function* testRemoveAndUndo() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  yield gCategoryUtilities.openType("experiment");
-
-  let addon = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(addon, "Got add-on element.");
-
-  yield clickRemoveButton(addon);
-  addon.parentNode.ensureElementIsVisible(addon);
-
-  let el = gManagerWindow.document.getAnonymousElementByAttribute(addon, "class", "pending");
-  is_element_visible(el, "Uninstall undo information should be visible.");
-
-  yield clickUndoButton(addon);
-  addon = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(addon, "Got add-on element.");
-});
-
-add_task(function* testCleanup() {
-  if (gExperiments) {
-    Services.prefs.clearUserPref("experiments.enabled");
-    Services.prefs.setCharPref("experiments.manifest.uri", gSavedManifestURI);
-
-    // We perform the uninit/init cycle to purge any leftover state.
-    yield OS.File.remove(gExperiments._cacheFilePath);
-    yield gExperiments.uninit();
-    yield gExperiments.init();
-  }
-
-  // Check post-conditions.
-  let addons = yield getExperimentAddons();
-  Assert.equal(addons.length, 0, "No experiment add-ons are installed.");
-
-  yield close_manager(gManagerWindow);
-});
diff --git a/toolkit/mozapps/webextensions/content/extensions.js b/toolkit/mozapps/webextensions/content/extensions.js
index 5e428fe17..3159eb1e1 100644
--- a/toolkit/mozapps/webextensions/content/extensions.js
+++ b/toolkit/mozapps/webextensions/content/extensions.js
@@ -29,9 +29,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
 XPCOMUtils.defineLazyModuleGetter(this, "Preferences",
                                   "resource://gre/modules/Preferences.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "Experiments",
-  "resource:///modules/experiments/Experiments.jsm");
-
 const PREF_DISCOVERURL = "extensions.webservice.discoverURL";
 const PREF_DISCOVER_ENABLED = "extensions.getAddons.showPane";
 const PREF_XPI_ENABLED = "xpinstall.enabled";
@@ -297,23 +294,6 @@ function isDiscoverEnabled() {
   return true;
 }
 
-function getExperimentEndDate(aAddon) {
-  if (!("@mozilla.org/browser/experiments-service;1" in Cc)) {
-    return 0;
-  }
-
-  if (!aAddon.isActive) {
-    return aAddon.endDate;
-  }
-
-  let experiment = Experiments.instance().getActiveExperiment();
-  if (!experiment) {
-    return 0;
-  }
-
-  return experiment.endDate;
-}
-
 /**
  * Obtain the main DOMWindow for the current context.
  */
@@ -1444,27 +1424,6 @@ var gViewController = {
       }
     },
 
-    cmd_experimentsLearnMore: {
-      isEnabled: function() {
-        let mainWindow = getMainWindow();
-        return mainWindow && "switchToTabHavingURI" in mainWindow;
-      },
-      doCommand: function() {
-        let url = Services.prefs.getCharPref("toolkit.telemetry.infoURL");
-        openOptionsInTab(url);
-      },
-    },
-
-    cmd_experimentsOpenTelemetryPreferences: {
-      isEnabled: function() {
-        return !!getMainWindowWithPreferencesPane();
-      },
-      doCommand: function() {
-        let mainWindow = getMainWindowWithPreferencesPane();
-        mainWindow.openAdvancedPreferences("dataChoicesTab");
-      },
-    },
-
     cmd_showUnsignedExtensions: {
       isEnabled: function() {
         return true;
@@ -1577,10 +1536,6 @@ function shouldShowVersionNumber(aAddon) {
   if (!aAddon.version)
     return false;
 
-  // The version number is hidden for experiments.
-  if (aAddon.type == "experiment")
-    return false;
-
   // The version number is hidden for lightweight themes.
   if (aAddon.type == "theme")
     return !/@personas\.mozilla\.org$/.test(aAddon.id);
@@ -1614,10 +1569,6 @@ function createItem(aObj, aIsInstall, aIsRemote) {
   // the binding handles the rest
   item.setAttribute("value", aObj.id);
 
-  if (aObj.type == "experiment") {
-    item.endDate = getExperimentEndDate(aObj);
-  }
-
   return item;
 }
 
@@ -2861,13 +2812,6 @@ var gListView = {
     // the existing item
     if (aInstall.existingAddon)
       this.removeItem(aInstall, true);
-
-    if (aInstall.addon.type == "experiment") {
-      let item = this.getListItemForID(aInstall.addon.id);
-      if (item) {
-        item.endDate = getExperimentEndDate(aInstall.addon);
-      }
-    }
   },
 
   addItem: function(aObj, aIsInstall) {
@@ -3126,34 +3070,6 @@ var gDetailView = {
       }
     }
 
-    if (this._addon.type == "experiment") {
-      let prefix = "details.experiment.";
-      let active = this._addon.isActive;
-
-      let stateKey = prefix + "state." + (active ? "active" : "complete");
-      let node = document.getElementById("detail-experiment-state");
-      node.value = gStrings.ext.GetStringFromName(stateKey);
-
-      let now = Date.now();
-      let end = getExperimentEndDate(this._addon);
-      let days = Math.abs(end - now) / (24 * 60 * 60 * 1000);
-
-      let timeKey = prefix + "time.";
-      let timeMessage;
-      if (days < 1) {
-        timeKey += (active ? "endsToday" : "endedToday");
-        timeMessage = gStrings.ext.GetStringFromName(timeKey);
-      } else {
-        timeKey += (active ? "daysRemaining" : "daysPassed");
-        days = Math.round(days);
-        let timeString = gStrings.ext.GetStringFromName(timeKey);
-        timeMessage = PluralForm.get(days, timeString)
-                                .replace("#1", days);
-      }
-
-      document.getElementById("detail-experiment-time").value = timeMessage;
-    }
-
     this.fillSettingsRows(aScrollToPreferences, (function() {
       this.updateState();
       gViewController.notifyViewChanged();
diff --git a/toolkit/mozapps/webextensions/test/browser/browser_experiments.js b/toolkit/mozapps/webextensions/test/browser/browser_experiments.js
deleted file mode 100644
index 18a548de5..000000000
--- a/toolkit/mozapps/webextensions/test/browser/browser_experiments.js
+++ /dev/null
@@ -1,654 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-Components.utils.import("resource://gre/modules/Promise.jsm", this);
-
-var {AddonManagerTesting} = Components.utils.import("resource://testing-common/AddonManagerTesting.jsm", {});
-var {HttpServer} = Components.utils.import("resource://testing-common/httpd.js", {});
-
-var gManagerWindow;
-var gCategoryUtilities;
-var gExperiments;
-var gHttpServer;
-
-var gSavedManifestURI;
-var gIsEnUsLocale;
-
-const SEC_IN_ONE_DAY = 24 * 60 * 60;
-const MS_IN_ONE_DAY  = SEC_IN_ONE_DAY * 1000;
-
-function getExperimentAddons() {
-  let deferred = Promise.defer();
-  AddonManager.getAddonsByTypes(["experiment"], (addons) => {
-    deferred.resolve(addons);
-  });
-  return deferred.promise;
-}
-
-function getInstallItem() {
-  let doc = gManagerWindow.document;
-  let view = get_current_view(gManagerWindow);
-  let list = doc.getElementById("addon-list");
-
-  let node = list.firstChild;
-  while (node) {
-    if (node.getAttribute("status") == "installing") {
-      return node;
-    }
-    node = node.nextSibling;
-  }
-
-  return null;
-}
-
-function patchPolicy(policy, data) {
-  for (let key of Object.keys(data)) {
-    Object.defineProperty(policy, key, {
-      value: data[key],
-      writable: true,
-    });
-  }
-}
-
-function defineNow(policy, time) {
-  patchPolicy(policy, { now: () => new Date(time) });
-}
-
-function openDetailsView(aId) {
-  let item = get_addon_element(gManagerWindow, aId);
-  Assert.ok(item, "Should have got add-on element.");
-  is_element_visible(item, "Add-on element should be visible.");
-
-  EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow);
-  EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow);
-
-  let deferred = Promise.defer();
-  wait_for_view_load(gManagerWindow, deferred.resolve);
-  return deferred.promise;
-}
-
-function clickRemoveButton(addonElement) {
-  let btn = gManagerWindow.document.getAnonymousElementByAttribute(addonElement, "anonid", "remove-btn");
-  if (!btn) {
-    return Promise.reject();
-  }
-
-  EventUtils.synthesizeMouseAtCenter(btn, { clickCount: 1 }, gManagerWindow);
-  let deferred = Promise.defer();
-  setTimeout(deferred.resolve, 0);
-  return deferred;
-}
-
-function clickUndoButton(addonElement) {
-  let btn = gManagerWindow.document.getAnonymousElementByAttribute(addonElement, "anonid", "undo-btn");
-  if (!btn) {
-    return Promise.reject();
-  }
-
-  EventUtils.synthesizeMouseAtCenter(btn, { clickCount: 1 }, gManagerWindow);
-  let deferred = Promise.defer();
-  setTimeout(deferred.resolve, 0);
-  return deferred;
-}
-
-add_task(function* initializeState() {
-  gManagerWindow = yield open_manager();
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  registerCleanupFunction(() => {
-    Services.prefs.clearUserPref("experiments.enabled");
-    Services.prefs.clearUserPref("toolkit.telemetry.enabled");
-    if (gHttpServer) {
-      gHttpServer.stop(() => {});
-      if (gSavedManifestURI !== undefined) {
-        Services.prefs.setCharPref("experments.manifest.uri", gSavedManifestURI);
-      }
-    }
-    if (gExperiments) {
-      let tmp = {};
-      Cu.import("resource:///modules/experiments/Experiments.jsm", tmp);
-      gExperiments._policy = new tmp.Experiments.Policy();
-    }
-  });
-
-  let chrome = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry);
-  gIsEnUsLocale = chrome.getSelectedLocale("global") == "en-US";
-
-  // The Experiments Manager will interfere with us by preventing installs
-  // of experiments it doesn't know about. We remove it from the equation
-  // because here we are only concerned with core Addon Manager operation,
-  // not the superset Experiments Manager has imposed.
-  if ("@mozilla.org/browser/experiments-service;1" in Components.classes) {
-    let tmp = {};
-    Cu.import("resource:///modules/experiments/Experiments.jsm", tmp);
-    // There is a race condition between XPCOM service initialization and
-    // this test running. We have to initialize the instance first, then
-    // uninitialize it to prevent this.
-    gExperiments = tmp.Experiments.instance();
-    yield gExperiments._mainTask;
-    yield gExperiments.uninit();
-  }
-});
-
-// On an empty profile with no experiments, the experiment category
-// should be hidden.
-add_task(function* testInitialState() {
-  Assert.ok(gCategoryUtilities.get("experiment", false), "Experiment tab is defined.");
-  Assert.ok(!gCategoryUtilities.isTypeVisible("experiment"), "Experiment tab hidden by default.");
-});
-
-add_task(function* testExperimentInfoNotVisible() {
-  yield gCategoryUtilities.openType("extension");
-  let el = gManagerWindow.document.getElementsByClassName("experiment-info-container")[0];
-  is_element_hidden(el, "Experiment info not visible on other types.");
-});
-
-// If we have an active experiment, we should see the experiments tab
-// and that tab should have some messages.
-add_task(function* testActiveExperiment() {
-  let addon = yield install_addon("addons/browser_experiment1.xpi");
-
-  Assert.ok(addon.userDisabled, "Add-on is disabled upon initial install.");
-  Assert.equal(addon.isActive, false, "Add-on is not active.");
-
-  Assert.ok(gCategoryUtilities.isTypeVisible("experiment"), "Experiment tab visible.");
-
-  yield gCategoryUtilities.openType("experiment");
-  let el = gManagerWindow.document.getElementsByClassName("experiment-info-container")[0];
-  is_element_visible(el, "Experiment info is visible on experiment tab.");
-});
-
-add_task(function* testExperimentLearnMore() {
-  // Actual URL is irrelevant.
-  Services.prefs.setCharPref("toolkit.telemetry.infoURL",
-                             "http://mochi.test:8888/server.js");
-
-  yield gCategoryUtilities.openType("experiment");
-  let btn = gManagerWindow.document.getElementById("experiments-learn-more");
-
-  if (!gUseInContentUI) {
-    is_element_hidden(btn, "Learn more button hidden if not using in-content UI.");
-    Services.prefs.clearUserPref("toolkit.telemetry.infoURL");
-
-    return;
-  }
-
-  is_element_visible(btn, "Learn more button visible.");
-
-  let deferred = Promise.defer();
-  window.addEventListener("DOMContentLoaded", function onLoad(event) {
-    info("Telemetry privacy policy window opened.");
-    window.removeEventListener("DOMContentLoaded", onLoad, false);
-
-    let browser = gBrowser.selectedBrowser;
-    let expected = Services.prefs.getCharPref("toolkit.telemetry.infoURL");
-    Assert.equal(browser.currentURI.spec, expected, "New tab should have loaded privacy policy.");
-    browser.contentWindow.close();
-
-    Services.prefs.clearUserPref("toolkit.telemetry.infoURL");
-
-    deferred.resolve();
-  }, false);
-
-  info("Opening telemetry privacy policy.");
-  EventUtils.synthesizeMouseAtCenter(btn, {}, gManagerWindow);
-
-  yield deferred.promise;
-});
-
-add_task(function* testOpenPreferences() {
-  yield gCategoryUtilities.openType("experiment");
-  let btn = gManagerWindow.document.getElementById("experiments-change-telemetry");
-  if (!gUseInContentUI) {
-    is_element_hidden(btn, "Change telemetry button not enabled in out of window UI.");
-    info("Skipping preferences open test because not using in-content UI.");
-    return;
-  }
-
-  is_element_visible(btn, "Change telemetry button visible in in-content UI.");
-
-  let deferred = Promise.defer();
-  Services.obs.addObserver(function observer(prefWin, topic, data) {
-    Services.obs.removeObserver(observer, "advanced-pane-loaded");
-    info("Advanced preference pane opened.");
-    executeSoon(function() {
-      // We want this test to fail if the preferences pane changes.
-      let el = prefWin.document.getElementById("dataChoicesPanel");
-      is_element_visible(el);
-
-      prefWin.close();
-      info("Closed preferences pane.");
-
-      deferred.resolve();
-    });
-  }, "advanced-pane-loaded", false);
-
-  info("Loading preferences pane.");
-  // We need to focus before synthesizing the mouse event (bug 1240052) as
-  // synthesizeMouseAtCenter currently only synthesizes the mouse in the child process.
-  // This can cause some subtle differences if the child isn't focused.
-  yield SimpleTest.promiseFocus();
-  yield BrowserTestUtils.synthesizeMouseAtCenter("#experiments-change-telemetry", {},
-                                                 gBrowser.selectedBrowser);
-
-  yield deferred.promise;
-});
-
-add_task(function* testButtonPresence() {
-  yield gCategoryUtilities.openType("experiment");
-  let item = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "remove-btn");
-  // Corresponds to the uninstall permission.
-  is_element_visible(el, "Remove button is visible.");
-  // Corresponds to lack of disable permission.
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "disable-btn");
-  is_element_hidden(el, "Disable button not visible.");
-  // Corresponds to lack of enable permission.
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "enable-btn");
-  is_element_hidden(el, "Enable button not visible.");
-});
-
-// Remove the add-on we've been testing with.
-add_task(function* testCleanup() {
-  yield AddonManagerTesting.uninstallAddonByID("test-experiment1@experiments.mozilla.org");
-  // Verify some conditions, just in case.
-  let addons = yield getExperimentAddons();
-  Assert.equal(addons.length, 0, "No experiment add-ons are installed.");
-});
-
-// The following tests should ideally live in browser/experiments/. However,
-// they rely on some of the helper functions from head.js, which can't easily
-// be consumed from other directories. So, they live here.
-
-add_task(function* testActivateExperiment() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  gHttpServer = new HttpServer();
-  gHttpServer.start(-1);
-  let root = "http://localhost:" + gHttpServer.identity.primaryPort + "/";
-  gHttpServer.registerPathHandler("/manifest", (request, response) => {
-    response.setStatusLine(null, 200, "OK");
-    response.write(JSON.stringify({
-      "version": 1,
-      "experiments": [
-        {
-          id: "experiment-1",
-          xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-          xpiHash: "IRRELEVANT",
-          startTime: Date.now() / 1000 - 3600,
-          endTime: Date.now() / 1000 + 3600,
-          maxActiveSeconds: 600,
-          appName: [Services.appinfo.name],
-          channel: [gExperiments._policy.updatechannel()],
-        },
-      ],
-    }));
-    response.processAsync();
-    response.finish();
-  });
-
-  gSavedManifestURI = Services.prefs.getCharPref("experiments.manifest.uri");
-  Services.prefs.setCharPref("experiments.manifest.uri", root + "manifest");
-
-  // We need to remove the cache file to help ensure consistent state.
-  yield OS.File.remove(gExperiments._cacheFilePath);
-
-  Services.prefs.setBoolPref("toolkit.telemetry.enabled", true);
-  Services.prefs.setBoolPref("experiments.enabled", true);
-
-  info("Initializing experiments service.");
-  yield gExperiments.init();
-  info("Experiments service finished first run.");
-
-  // Check conditions, just to be sure.
-  let experiments = yield gExperiments.getExperiments();
-  Assert.equal(experiments.length, 0, "No experiments known to the service.");
-
-  // This makes testing easier.
-  gExperiments._policy.ignoreHashes = true;
-
-  info("Manually updating experiments manifest.");
-  yield gExperiments.updateManifest();
-  info("Experiments update complete.");
-
-  let deferred = Promise.defer();
-  gHttpServer.stop(() => {
-    gHttpServer = null;
-
-    info("getting experiment by ID");
-    AddonManager.getAddonByID("test-experiment1@experiments.mozilla.org", (addon) => {
-      Assert.ok(addon, "Add-on installed via Experiments manager.");
-
-      deferred.resolve();
-    });
-  });
-
-  yield deferred.promise;
-
-  Assert.ok(gCategoryUtilities.isTypeVisible, "experiment", "Experiment tab visible.");
-  yield gCategoryUtilities.openType("experiment");
-  let el = gManagerWindow.document.getElementsByClassName("experiment-info-container")[0];
-  is_element_visible(el, "Experiment info is visible on experiment tab.");
-});
-
-add_task(function* testDeactivateExperiment() {
-  if (!gExperiments) {
-    return;
-  }
-
-  // Fake an empty manifest to purge data from previous manifest.
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [],
-  });
-
-  yield gExperiments.disableExperiment("testing");
-
-  // We should have a record of the previously-active experiment.
-  let experiments = yield gExperiments.getExperiments();
-  Assert.equal(experiments.length, 1, "1 experiment is known.");
-  Assert.equal(experiments[0].active, false, "Experiment is not active.");
-
-  // We should have a previous experiment in the add-ons manager.
-  let deferred = Promise.defer();
-  AddonManager.getAddonsByTypes(["experiment"], (addons) => {
-    deferred.resolve(addons);
-  });
-  let addons = yield deferred.promise;
-  Assert.equal(addons.length, 1, "1 experiment add-on known.");
-  Assert.ok(addons[0].appDisabled, "It is a previous experiment.");
-  Assert.equal(addons[0].id, "experiment-1", "Add-on ID matches expected.");
-
-  // Verify the UI looks sane.
-
-  Assert.ok(gCategoryUtilities.isTypeVisible("experiment"), "Experiment tab visible.");
-  let item = get_addon_element(gManagerWindow, "experiment-1");
-  Assert.ok(item, "Got add-on element.");
-  Assert.ok(!item.active, "Element should not be active.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  // User control buttons should not be present because previous experiments
-  // should have no permissions.
-  let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "remove-btn");
-  is_element_hidden(el, "Remove button is not visible.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "disable-btn");
-  is_element_hidden(el, "Disable button is not visible.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "enable-btn");
-  is_element_hidden(el, "Enable button is not visible.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "preferences-btn");
-  is_element_hidden(el, "Preferences button is not visible.");
-});
-
-add_task(function* testActivateRealExperiments() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [
-      {
-        id: "experiment-2",
-        xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-        xpiHash: "IRRELEVANT",
-        startTime: Date.now() / 1000 - 3600,
-        endTime: Date.now() / 1000 + 3600,
-        maxActiveSeconds: 600,
-        appName: [Services.appinfo.name],
-        channel: [gExperiments._policy.updatechannel()],
-      },
-    ],
-  });
-  yield gExperiments._run();
-
-  // Check the active experiment.
-
-  let item = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Active");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Less than a day remaining");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "error-container");
-  is_element_hidden(el, "error-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "warning-container");
-  is_element_hidden(el, "warning-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "pending-container");
-  is_element_hidden(el, "pending-container should be hidden.");
-  let { version } = yield get_tooltip_info(item);
-  Assert.equal(version, undefined, "version should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "disabled-postfix");
-  is_element_hidden(el, "disabled-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "update-postfix");
-  is_element_hidden(el, "update-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-
-  // Check the previous experiment.
-
-  item = get_addon_element(gManagerWindow, "experiment-1");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Complete");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Less than a day ago");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "error-container");
-  is_element_hidden(el, "error-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "warning-container");
-  is_element_hidden(el, "warning-container should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "pending-container");
-  is_element_hidden(el, "pending-container should be hidden.");
-  ({ version } = yield get_tooltip_info(item));
-  Assert.equal(version, undefined, "version should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "disabled-postfix");
-  is_element_hidden(el, "disabled-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "update-postfix");
-  is_element_hidden(el, "update-postfix should be hidden.");
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-
-  // Install an "older" experiment.
-
-  yield gExperiments.disableExperiment("experiment-2");
-
-  let now = Date.now();
-  let fakeNow = now - 5 * MS_IN_ONE_DAY;
-  defineNow(gExperiments._policy, fakeNow);
-
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [
-      {
-        id: "experiment-3",
-        xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-        xpiHash: "IRRELEVANT",
-        startTime: fakeNow / 1000 - SEC_IN_ONE_DAY,
-        endTime: now / 1000 + 10 * SEC_IN_ONE_DAY,
-        maxActiveSeconds: 100 * SEC_IN_ONE_DAY,
-        appName: [Services.appinfo.name],
-        channel: [gExperiments._policy.updatechannel()],
-      },
-    ],
-  });
-  yield gExperiments._run();
-
-  // Check the active experiment.
-
-  item = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Active");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "10 days remaining");
-  }
-
-  // Disable it and check it's previous experiment entry.
-
-  yield gExperiments.disableExperiment("experiment-3");
-
-  item = get_addon_element(gManagerWindow, "experiment-3");
-  Assert.ok(item, "Got add-on element.");
-  item.parentNode.ensureElementIsVisible(item);
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Complete");
-  }
-
-  el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "5 days ago");
-  }
-});
-
-add_task(function* testDetailView() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  defineNow(gExperiments._policy, Date.now());
-  yield gExperiments._updateExperiments({
-    "version": 1,
-    "experiments": [
-      {
-        id: "experiment-4",
-        xpiURL: TESTROOT + "addons/browser_experiment1.xpi",
-        xpiHash: "IRRELEVANT",
-        startTime: Date.now() / 1000 - 3600,
-        endTime: Date.now() / 1000 + 3600,
-        maxActiveSeconds: 600,
-        appName: [Services.appinfo.name],
-        channel: [gExperiments._policy.updatechannel()],
-      },
-    ],
-  });
-  yield gExperiments._run();
-
-  // Check active experiment.
-
-  yield openDetailsView("test-experiment1@experiments.mozilla.org");
-
-  let el = gManagerWindow.document.getElementById("detail-experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Active");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Less than a day remaining");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-version");
-  is_element_hidden(el, "detail-version should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-creator");
-  is_element_hidden(el, "detail-creator should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-
-  // Check previous experiment.
-
-  yield gCategoryUtilities.openType("experiment");
-  yield openDetailsView("experiment-3");
-
-  el = gManagerWindow.document.getElementById("detail-experiment-state");
-  is_element_visible(el, "Experiment state label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "Complete");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-experiment-time");
-  is_element_visible(el, "Experiment time label should be visible.");
-  if (gIsEnUsLocale) {
-    Assert.equal(el.value, "5 days ago");
-  }
-
-  el = gManagerWindow.document.getElementById("detail-version");
-  is_element_hidden(el, "detail-version should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-creator");
-  is_element_hidden(el, "detail-creator should be hidden.");
-  el = gManagerWindow.document.getElementById("detail-experiment-bullet");
-  is_element_visible(el, "experiment-bullet should be visible.");
-});
-
-add_task(function* testRemoveAndUndo() {
-  if (!gExperiments) {
-    info("Skipping experiments test because that feature isn't available.");
-    return;
-  }
-
-  yield gCategoryUtilities.openType("experiment");
-
-  let addon = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(addon, "Got add-on element.");
-
-  yield clickRemoveButton(addon);
-  addon.parentNode.ensureElementIsVisible(addon);
-
-  let el = gManagerWindow.document.getAnonymousElementByAttribute(addon, "class", "pending");
-  is_element_visible(el, "Uninstall undo information should be visible.");
-
-  yield clickUndoButton(addon);
-  addon = get_addon_element(gManagerWindow, "test-experiment1@experiments.mozilla.org");
-  Assert.ok(addon, "Got add-on element.");
-});
-
-add_task(function* testCleanup() {
-  if (gExperiments) {
-    Services.prefs.clearUserPref("experiments.enabled");
-    Services.prefs.setCharPref("experiments.manifest.uri", gSavedManifestURI);
-
-    // We perform the uninit/init cycle to purge any leftover state.
-    yield OS.File.remove(gExperiments._cacheFilePath);
-    yield gExperiments.uninit();
-    yield gExperiments.init();
-
-    Services.prefs.clearUserPref("toolkit.telemetry.enabled");
-  }
-
-  // Check post-conditions.
-  let addons = yield getExperimentAddons();
-  Assert.equal(addons.length, 0, "No experiment add-ons are installed.");
-
-  yield close_manager(gManagerWindow);
-});
-- 
cgit v1.2.3


From bd32d607adc1cf3900e08e0e69fee9001553f2b8 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Mon, 9 Apr 2018 19:25:12 +0200
Subject: [PALEMOON] [DevTools] Fix some paths with ToolboxProcess.jsm
 (extensions)

Issue #102
---
 toolkit/mozapps/extensions/content/extensions.js    | 2 +-
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 1d8d5bb0a..6f2a47482 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -19,7 +19,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
                                   "resource://gre/modules/PluralForm.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function () {
-  return Cu.import("resource://gre/modules/devtools/ToolboxProcess.jsm", {}).
+  return Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {}).
          BrowserToolboxProcess;
 });
 
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 54b86edc4..e6334bf1d 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -37,7 +37,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserToolboxProcess",
-                                  "resource://gre/modules/devtools/ToolboxProcess.jsm");
+                                  "resource://devtools/client/framework/ToolboxProcess.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ConsoleAPI",
                                   "resource://gre/modules/devtools/Console.jsm");
 
@@ -2082,7 +2082,7 @@ this.XPIProvider = {
       Services.prefs.addObserver(PREF_EM_MIN_COMPAT_APP_VERSION, this, false);
       Services.prefs.addObserver(PREF_EM_MIN_COMPAT_PLATFORM_VERSION, this, false);
       Services.obs.addObserver(this, NOTIFICATION_FLUSH_PERMISSIONS, false);
-      if (Cu.isModuleLoaded("resource://gre/modules/devtools/ToolboxProcess.jsm")) {
+      if (Cu.isModuleLoaded("resource://devtools/client/framework/ToolboxProcess.jsm")) {
         // If BrowserToolboxProcess is already loaded, set the boolean to true
         // and do whatever is needed
         this._toolboxProcessLoaded = true;
-- 
cgit v1.2.3


From fc249d76a47628be6ef6aa259db7358bfe37ebf6 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Mon, 9 Apr 2018 21:15:24 +0200
Subject: [PALEMOON] Fix some paths (deprecated) with Console.jsm
 (sessionstore, extensions)

---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolkit')

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index e6334bf1d..d5f1ab5dd 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -39,7 +39,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "OS",
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserToolboxProcess",
                                   "resource://devtools/client/framework/ToolboxProcess.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ConsoleAPI",
-                                  "resource://gre/modules/devtools/Console.jsm");
+                                  "resource://gre/modules/Console.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "Blocklist",
                                    "@mozilla.org/extensions/blocklist;1",
-- 
cgit v1.2.3


From ac05ab923af8bc5b0c077fe3a271492af19dbea8 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 11 Apr 2018 17:30:34 +0200
Subject: Fix aboutSupport.js

Addresses comments:
https://github.com/MoonchildProductions/UXP/commit/bf6bb142fc5bcb49b053788e06160af304f639e5#commitcomment-28527974
https://github.com/MoonchildProductions/UXP/commit/0f99df52d5309158c7b916581c5a79496b1844db#commitcomment-28527792
---
 toolkit/content/aboutSupport.js | 16 ----------------
 toolkit/content/jar.mn          |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 5daf6d189..97b795b5b 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -151,22 +151,6 @@ var snapshotFormatters = {
     }));
   },
 
-  experiments: function experiments(data) {
-    $.append($("experiments-tbody"), data.map(function (experiment) {
-      return $.new("tr", [
-        $.new("td", experiment.name),
-        $.new("td", experiment.id),
-        $.new("td", experiment.description),
-        $.new("td", experiment.active),
-        $.new("td", experiment.endDate),
-        $.new("td", [
-          $.new("a", experiment.detailURL, null, {href : experiment.detailURL, })
-        ]),
-        $.new("td", experiment.branch),
-      ]);
-    }));
-  },
-
   modifiedPreferences: function modifiedPreferences(data) {
     $.append($("prefs-tbody"), sortedArrayFromObject(data).map(
       function ([name, value]) {
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 946e499f1..f9ac19a24 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -28,7 +28,7 @@ toolkit.jar:
    content/global/aboutwebrtc/aboutWebrtc.css   (aboutwebrtc/aboutWebrtc.css)
    content/global/aboutwebrtc/aboutWebrtc.js    (aboutwebrtc/aboutWebrtc.js)
    content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html)
-   content/global/aboutSupport.js
+*  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
    content/global/aboutTelemetry.js
    content/global/aboutTelemetry.xhtml
-- 
cgit v1.2.3