No bug - Remove some pointless abbreviations of Ci members. rs=me

--HG--
extra : amend_source : 473db9cf606804aff4c821c625b425782d7c96fb

mail/components/preferences/chat.js

@@ -130,8 +130,7 @@ var gChatPane = {
   },
 
   browseForSoundFile() {
-    const nsIFilePicker = Ci.nsIFilePicker;
-    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
 
     // If we already have a sound file, then use the path for that sound file
     // as the initial path in the dialog.
@@ -148,13 +147,13 @@ var gChatPane = {
       document
         .getElementById("bundlePreferences")
         .getString("soundFilePickerTitle"),
-      nsIFilePicker.modeOpen
+      Ci.nsIFilePicker.modeOpen
     );
     fp.appendFilters(Ci.nsIFilePicker.filterAudio);
     fp.appendFilters(Ci.nsIFilePicker.filterAll);
 
     fp.open(rv => {
-      if (rv != nsIFilePicker.returnOK) {
+      if (rv != Ci.nsIFilePicker.returnOK) {
         return;
       }
 

mail/components/preferences/general.js

@@ -553,8 +553,7 @@ var gGeneralPane = {
   },
 
   browseForSoundFile() {
-    const nsIFilePicker = Ci.nsIFilePicker;
-    var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+    var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
 
     // if we already have a sound file, then use the path for that sound file
     // as the initial path in the dialog.
@@ -571,13 +570,13 @@ var gGeneralPane = {
       document
         .getElementById("bundlePreferences")
         .getString("soundFilePickerTitle"),
-      nsIFilePicker.modeOpen
+      Ci.nsIFilePicker.modeOpen
     );
     fp.appendFilters(Ci.nsIFilePicker.filterAudio);
     fp.appendFilters(Ci.nsIFilePicker.filterAll);
 
     fp.open(rv => {
-      if (rv != nsIFilePicker.returnOK || !fp.file) {
+      if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
         return;
       }
       // convert the nsIFile into a nsIFile url
@@ -2463,18 +2462,17 @@ class HandlerRow {
         params
       );
     } else {
-      const nsIFilePicker = Ci.nsIFilePicker;
-      let fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+      let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
       let winTitle = gGeneralPane._prefsBundle.getString("fpTitleChooseApp");
-      fp.init(window, winTitle, nsIFilePicker.modeOpen);
-      fp.appendFilters(nsIFilePicker.filterApps);
+      fp.init(window, winTitle, Ci.nsIFilePicker.modeOpen);
+      fp.appendFilters(Ci.nsIFilePicker.filterApps);
 
       // Prompt the user to pick an app.  If they pick one, and it's a valid
       // selection, then add it to the list of possible handlers.
 
       fp.open(rv => {
         if (
-          rv == nsIFilePicker.returnOK &&
+          rv == Ci.nsIFilePicker.returnOK &&
           fp.file &&
           gGeneralPane._isValidHandlerExecutable(fp.file)
         ) {

mail/components/preferences/permissions.js

@@ -9,9 +9,6 @@ var { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 
-var nsIPermissionManager = Ci.nsIPermissionManager;
-var nsICookiePermission = Ci.nsICookiePermission;
-
 var NOTIFICATION_FLUSH_PERMISSIONS = "flush-pending-permissions";
 
 /**
@@ -84,16 +81,16 @@ var gPermissionManager = {
   async _getCapabilityString(aCapability) {
     var stringKey = null;
     switch (aCapability) {
-      case nsIPermissionManager.ALLOW_ACTION:
+      case Ci.nsIPermissionManager.ALLOW_ACTION:
         stringKey = "permission-can-label";
         break;
-      case nsIPermissionManager.DENY_ACTION:
+      case Ci.nsIPermissionManager.DENY_ACTION:
         stringKey = "permission-cannot-label";
         break;
-      case nsICookiePermission.ACCESS_ALLOW_FIRST_PARTY_ONLY:
+      case Ci.nsICookiePermission.ACCESS_ALLOW_FIRST_PARTY_ONLY:
         stringKey = "permission-can-access-first-party-label";
         break;
-      case nsICookiePermission.ACCESS_SESSION:
+      case Ci.nsICookiePermission.ACCESS_SESSION:
         stringKey = "permission-can-session-label";
         break;
     }