Backed out changeset 1cec1e936552 (bug 1498311) for ES linting failure
authorshindli <shindli@mozilla.com>
Fri, 12 Oct 2018 00:10:59 +0300
changeset 496556 0eef1b37d8ec0e657816a9b0529e68087a09bb30
parent 496555 13ef28edfdc0ebe2cdddf4947f39a229f6557232
child 496557 a4f93ead3508287a3fe044d35e4913e2f9436f6d
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1498311
milestone64.0a1
backs out1cec1e9365524792ae0aeb11e53c33885f77f44e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1cec1e936552 (bug 1498311) for ES linting failure
toolkit/components/extensions/ExtensionContent.jsm
toolkit/components/extensions/test/xpcshell/test_ext_userScripts.js
--- a/toolkit/components/extensions/ExtensionContent.jsm
+++ b/toolkit/components/extensions/ExtensionContent.jsm
@@ -63,17 +63,17 @@ const {
   ChildAPIManager,
   Messenger,
 } = ExtensionChild;
 
 XPCOMUtils.defineLazyGetter(this, "console", ExtensionCommon.getConsole);
 
 XPCOMUtils.defineLazyGetter(this, "isContentScriptProcess", () => {
   return Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT ||
-         !WebExtensionPolicy.useRemoteWebExtensions;
+      !Services.appinfo.browserTabsRemoteAutostart;
 });
 
 var DocumentManager;
 
 const CATEGORY_EXTENSION_SCRIPTS_CONTENT = "webextension-scripts-content";
 
 var apiManager = new class extends SchemaAPIManager {
   constructor() {
--- a/toolkit/components/extensions/test/xpcshell/test_ext_userScripts.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_userScripts.js
@@ -155,19 +155,17 @@ add_task(async function test_userScripts
 
   await extension.unload();
 });
 
 // Test that userScripts sandboxes:
 // - can be registered/unregistered from an extension page
 // - have no WebExtensions APIs available
 // - are able to access the target window and document
-
-// Temporarily disabled due to bug 1498364
-false && add_task(async function test_userScripts_no_webext_apis() {
+add_task(async function test_userScripts_no_webext_apis() {
   async function background() {
     const matches = ["http://localhost/*/file_sample.html"];
 
     const sharedCode = {code: "console.log(\"js code shared by multiple userScripts\");"};
 
     let script = await browser.userScripts.register({
       js: [sharedCode, {
         code: `