Merge mozilla-central to autoland. a=merge CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Fri, 28 Sep 2018 14:53:09 +0300
changeset 487030 98eabe8273c12207e45d60a65d960b42604100d8
parent 487029 f30d81ec891f23f6ec2cdb99f3adb023d4e8957f (current diff)
parent 487003 ce24611f29dc6d64ae2d3a0c60ae5928bf87e2aa (diff)
child 487031 b2ef383204c5af98c56a525a9b0287a29fc1c591
push id246
push userfmarier@mozilla.com
push dateSat, 13 Oct 2018 00:15:40 +0000
reviewersmerge
milestone64.0a1
Merge mozilla-central to autoland. a=merge CLOSED TREE
--- a/testing/profiles/perf/user.js
+++ b/testing/profiles/perf/user.js
@@ -61,17 +61,17 @@ user_pref("extensions.systemAddon.update
 user_pref("extensions.update.background.url", "http://127.0.0.1/extensions-dummy/updateBackgroundURL");
 user_pref("extensions.update.notifyUser", false);
 user_pref("extensions.update.url", "http://127.0.0.1/extensions-dummy/updateURL");
 user_pref("extensions.webservice.discoverURL", "http://127.0.0.1/extensions-dummy/discoveryURL");
 user_pref("identity.fxaccounts.auth.uri", "https://127.0.0.1/fxa-dummy/");
 user_pref("identity.fxaccounts.migrateToDevEdition", false);
 // Make tests run consistently on DevEdition (which has a lightweight theme
 // selected by default).
-user_pref("lightweightThemes.selectedThemeID", "default-theme@mozilla.org");
+user_pref("lightweightThemes.selectedThemeID", "");
 user_pref("media.capturestream_hints.enabled", true);
 user_pref("media.gmp-manager.url", "http://127.0.0.1/gmpmanager-dummy/update.xml");
 // Don't block old libavcodec libraries when testing, because our test systems
 // cannot easily be upgraded.
 user_pref("media.libavcodec.allow-obsolete", true);
 user_pref("media.navigator.enabled", true);
 user_pref("media.navigator.permission.disabled", true);
 user_pref("media.peerconnection.enabled", true);
--- a/testing/profiles/unittest/user.js
+++ b/testing/profiles/unittest/user.js
@@ -184,17 +184,17 @@ user_pref("layout.css.prefixes.webkit", 
 // Make sure CSS error reporting is enabled for tests
 user_pref("layout.css.report_errors", true);
 // Enable CSS shape-outside for testing
 user_pref("layout.css.shape-outside.enabled", true);
 // Disable spammy layout warnings because they pollute test logs
 user_pref("layout.spammy_warnings.enabled", false);
 // Make tests run consistently on DevEdition (which has a lightweight theme
 // selected by default).
-user_pref("lightweightThemes.selectedThemeID", "default-theme@mozilla.org");
+user_pref("lightweightThemes.selectedThemeID", "");
 // Disable all recommended Marionette preferences for Gecko tests.
 // The prefs recommended by Marionette are typically geared towards
 // consumer automation; not vendor testing.
 user_pref("marionette.prefs.recommended", false);
 user_pref("media.av1.enabled", true);
 user_pref("media.cache_size", 1000);
 user_pref("media.dormant-on-pause-timeout-ms", 0); // Enter dormant immediately without waiting for timeout.
 // Set the number of shmems the PChromiumCDM protocol pre-allocates to 0,
--- a/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_management_themes.js
@@ -120,17 +120,16 @@ add_task(async function test_management_
     headerURL: "http://mochi.test:8888/data/header.png",
     previewURL: "http://mochi.test:8888/data/preview.png",
     iconURL: "http://mochi.test:8888/data/icon.png",
     textcolor: Math.random().toString(),
     accentcolor: Math.random().toString(),
   };
   is(await extension.awaitMessage("onInstalled"), "Bling", "LWT installed");
   is(await extension.awaitMessage("onEnabled"), "Bling", "LWT enabled");
-  is(await extension.awaitMessage("onDisabled"), "Default", "default disabled");
 
   await theme.startup();
   is(await extension.awaitMessage("onInstalled"), "Simple theme test", "webextension theme installed");
   is(await extension.awaitMessage("onDisabled"), "Bling", "LWT disabled");
   // no enabled event when installed.
 
   extension.sendMessage("test");
   is(await extension.awaitMessage("onEnabled"), "Default", "default enabled");