mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 13:18:45 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
43 lines
1.9 KiB
JavaScript
43 lines
1.9 KiB
JavaScript
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* 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/. */
|
|
"use strict";
|
|
|
|
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
var {HTTP_400, HTTP_401, HTTP_402, HTTP_403, HTTP_404, HTTP_405, HTTP_406, HTTP_407, HTTP_408, HTTP_409, HTTP_410, HTTP_411, HTTP_412, HTTP_413, HTTP_414, HTTP_415, HTTP_417, HTTP_500, HTTP_501, HTTP_502, HTTP_503, HTTP_504, HTTP_505, HttpError, HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js");
|
|
|
|
XPCOMUtils.defineLazyServiceGetter(this, "gCaptivePortalDetector",
|
|
"@mozilla.org/toolkit/captive-detector;1",
|
|
"nsICaptivePortalDetector");
|
|
|
|
const kCanonicalSitePath = "/canonicalSite.html";
|
|
const kCanonicalSiteContent = "true";
|
|
const kPrefsCanonicalURL = "captivedetect.canonicalURL";
|
|
const kPrefsCanonicalContent = "captivedetect.canonicalContent";
|
|
const kPrefsMaxWaitingTime = "captivedetect.maxWaitingTime";
|
|
const kPrefsPollingTime = "captivedetect.pollingTime";
|
|
|
|
var gServer;
|
|
var gServerURL;
|
|
|
|
function setupPrefs() {
|
|
Services.prefs.setCharPref(kPrefsCanonicalURL, gServerURL + kCanonicalSitePath);
|
|
Services.prefs.setCharPref(kPrefsCanonicalContent, kCanonicalSiteContent);
|
|
Services.prefs.setIntPref(kPrefsMaxWaitingTime, 0);
|
|
Services.prefs.setIntPref(kPrefsPollingTime, 1);
|
|
}
|
|
|
|
function run_captivedetect_test(xhr_handler, fakeUIResponse, testfun) {
|
|
gServer = new HttpServer();
|
|
gServer.registerPathHandler(kCanonicalSitePath, xhr_handler);
|
|
gServer.start(-1);
|
|
gServerURL = "http://localhost:" + gServer.identity.primaryPort;
|
|
|
|
setupPrefs();
|
|
|
|
fakeUIResponse();
|
|
|
|
testfun();
|
|
}
|