Bug 1427754 - Enable ESLint rule mozilla/use-services for accessible/
MozReview-Commit-ID: EJoFyhMfQzv
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -23,17 +23,16 @@ module.exports = {
"files": "**/*.*html",
"rules": {
"eol-last": "off",
}
}, {
// XXX Bug 1421969. These files/directories are still being fixed,
// so turn off mozilla/use-services for them for now.
"files": [
- "accessible/**",
// Browser: Bug 1421379
"browser/extensions/shield-recipe-client/test/browser/head.js",
"browser/modules/offlineAppCache.jsm",
"devtools/**",
"dom/indexedDB/**",
"dom/media/**",
"extensions/pref/**",
"mobile/android/**",
--- a/accessible/tests/mochitest/common.js
+++ b/accessible/tests/mochitest/common.js
@@ -705,29 +705,24 @@ function getLoadContext() {
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsILoadContext);
}
/**
* Return text from clipboard.
*/
function getTextFromClipboard() {
- var clip = Components.classes["@mozilla.org/widget/clipboard;1"].
- getService(Components.interfaces.nsIClipboard);
- if (!clip)
- return "";
-
var trans = Components.classes["@mozilla.org/widget/transferable;1"].
createInstance(Components.interfaces.nsITransferable);
trans.init(getLoadContext());
if (!trans)
return "";
trans.addDataFlavor("text/unicode");
- clip.getData(trans, clip.kGlobalClipboard);
+ Services.clipboard.getData(trans, Services.clipboard.kGlobalClipboard);
var str = {};
var strLength = {};
trans.getTransferData("text/unicode", str, strLength);
if (str)
str = str.value.QueryInterface(Components.interfaces.nsISupportsString);
if (str)
--- a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html
+++ b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html
@@ -1,59 +1,54 @@
<html>
<head>
<title>application accessible name</title>
- <link rel="stylesheet" type="text/css"
+ <link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
- <script type="application/javascript"
+ <script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
- <script type="application/javascript"
+ <script type="application/javascript"
src="../common.js"></script>
- <script type="application/javascript"
+ <script type="application/javascript"
src="../role.js"></script>
<script type="application/javascript">
+ /* import-globals-from ../common.js */
function doTest() {
var accessible = getApplicationAccessible();
if (!accessible) {
SimpleTest.finish();
return;
}
- var bundleServ =
- Components.classes["@mozilla.org/intl/stringbundle;1"].
- getService(Components.interfaces.nsIStringBundleService);
var brandBundle =
- bundleServ.createBundle("chrome://branding/locale/brand.properties");
-
- var appInfo = Components.classes["@mozilla.org/xre/app-info;1"].
- getService(Components.interfaces.nsIXULAppInfo);
+ Services.strings.createBundle("chrome://branding/locale/brand.properties");
// nsIAccessible::name
var applicationName = "";
if (LINUX || SOLARIS) {
- applicationName = appInfo.name;
+ applicationName = Services.appinfo.name;
} else {
try {
applicationName = brandBundle.GetStringFromName("brandShortName");
} catch (e) {
}
if (applicationName == "")
applicationName = "Gecko based application";
}
is(accessible.name, applicationName, "wrong application accessible name");
// nsIAccessibleApplication
- is(accessible.appName, appInfo.name, "Wrong application name");
- is(accessible.appVersion, appInfo.version, "Wrong application version");
+ is(accessible.appName, Services.appinfo.name, "Wrong application name");
+ is(accessible.appVersion, Services.appinfo.version, "Wrong application version");
is(accessible.platformName, "Gecko", "Wrong platform name");
- is(accessible.platformVersion, appInfo.platformVersion,
+ is(accessible.platformVersion, Services.appinfo.platformVersion,
"Wrong platform version");
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
addA11yLoadEvent(doTest);
</script>
--- a/accessible/tests/mochitest/textcaret/test_general.html
+++ b/accessible/tests/mochitest/textcaret/test_general.html
@@ -10,23 +10,22 @@
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript"
src="../common.js"></script>
<script type="application/javascript"
src="../events.js"></script>
<script type="application/javascript">
+ /* import-globals-from ../common.js */
/**
* Turn on/off the caret browsing mode.
*/
function turnCaretBrowsing(aIsOn) {
- var prefs = Components.classes["@mozilla.org/preferences-service;1"].
- getService(Components.interfaces.nsIPrefBranch);
- prefs.setBoolPref("accessibility.browsewithcaret", aIsOn);
+ Services.prefs.setBoolPref("accessibility.browsewithcaret", aIsOn);
}
/**
* Test caret offset for the given accessible.
*/
function testCaretOffset(aID, aCaretOffset) {
var acc = getAccessible(aID, [nsIAccessibleText]);
is(acc.caretOffset, aCaretOffset,