Bug 1696626 - followup to fix linting. rs=eslint

--HG--
extra : rebase_source : cdb84457b2d1575a1186dc50d10b04334d7718ac

mailnews/addrbook/modules/LDAPDirectory.jsm

@@ -46,7 +46,7 @@ class LDAPDirectory extends AddrBookDirectory {
   }
 
   set replicationFileName(value) {
-    return this.setStringValue("filename", value);
+    this.setStringValue("filename", value);
   }
 
   get protocolVersion() {
@@ -56,7 +56,7 @@ class LDAPDirectory extends AddrBookDirectory {
   }
 
   set protocolVersion(value) {
-    return this.setStringValue(
+    this.setStringValue(
       "protocolVersion",
       value == Ci.nsILDAPConnection.VERSION3 ? "3" : "2"
     );
@@ -67,7 +67,7 @@ class LDAPDirectory extends AddrBookDirectory {
   }
 
   set saslMechanism(value) {
-    return this.setStringValue("auth.saslmech", value);
+    this.setStringValue("auth.saslmech", value);
   }
 
   get authDn() {
@@ -75,7 +75,7 @@ class LDAPDirectory extends AddrBookDirectory {
   }
 
   set authDn(value) {
-    return this.setStringValue("auth.dn", value);
+    this.setStringValue("auth.dn", value);
   }
 
   get attributeMap() {

mailnews/addrbook/modules/QueryStringToExpression.jsm

@@ -4,6 +4,8 @@
 
 const EXPORTED_SYMBOLS = ["QueryStringToExpression"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
 /**
  * A module to parse a query string to a nsIAbBooleanExpression. A valid query
  * string is in this form:
@@ -165,11 +167,8 @@ var QueryStringToExpression = {
     cs.condition = cond;
 
     try {
-      let textToSubURI = Cc["@mozilla.org/intl/texttosuburi;1"].getService(
-        Ci.nsITextToSubURI
-      );
-      cs.name = textToSubURI.unEscapeAndConvert("UTF-8", name);
-      cs.value = textToSubURI.unEscapeAndConvert("UTF-8", value);
+      cs.name = Services.textToSubURI.unEscapeAndConvert("UTF-8", name);
+      cs.value = Services.textToSubURI.unEscapeAndConvert("UTF-8", value);
     } catch (e) {
       cs.name = name;
       cs.value = value;