Bug 1617887 - remove unused (mozmill) os.jsm imports. r=khushil

mail/test/browser/attachment/browser_attachmentEvents.js

@@ -10,8 +10,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { select_attachments } = ChromeUtils.import(
   "resource://testing-common/mozmill/AttachmentHelpers.jsm"
 );

mail/test/browser/attachment/browser_attachmentInPlainMsg.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { wait_for_element_visible } = ChromeUtils.import(
   "resource://testing-common/mozmill/DOMHelpers.jsm"
 );

mail/test/browser/attachment/browser_attachmentMenus.js

@@ -11,7 +11,6 @@ var epsilon;
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 var controller = ChromeUtils.import(
   "resource://testing-common/mozmill/controller.jsm"
 );

mail/test/browser/attachment/browser_attachmentSize.js

@@ -8,7 +8,6 @@ var folder;
 var messenger;
 var epsilon;
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 var controller = ChromeUtils.import(
   "resource://testing-common/mozmill/controller.jsm"
 );

mail/test/browser/composition/browser_attachment.js

@@ -11,7 +11,6 @@
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var {
   add_attachments,

mail/test/browser/composition/browser_base64Display.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { open_message_from_file } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );

mail/test/browser/composition/browser_blockedContent.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var {
   get_msg_source,
   open_compose_new_mail,
@@ -93,7 +91,8 @@ add_task(function test_paste_file_urls() {
       return OS.File.setDates(dest, null, null);
     })
     .then(function() {
-      tmpFile = os.getFileForPath(dest);
+      tmpFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
+      tmpFile.initWithPath(dest);
       Assert.ok(tmpFile.exists(), "tmpFile's not there at " + dest);
 
       tmpFileURL = fileHandler.getURLSpecFromFile(tmpFile);

mail/test/browser/composition/browser_charsetEdit.js

@@ -12,7 +12,6 @@
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 var utils = ChromeUtils.import("resource://testing-common/mozmill/utils.jsm");
 
 var {

mail/test/browser/composition/browser_cp932Display.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { open_message_from_file } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );

mail/test/browser/composition/browser_emlActions.js

@@ -11,7 +11,6 @@
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var {
   close_compose_window,

mail/test/browser/composition/browser_forwardRFC822Attach.js

@@ -9,8 +9,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var {
   close_compose_window,
   get_msg_source,

mail/test/browser/composition/browser_forwardUTF8.js

@@ -11,7 +11,6 @@
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var {
   close_compose_window,

mail/test/browser/composition/browser_imageDisplay.js

@@ -8,7 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );

mail/test/browser/composition/browser_multipartRelated.js

@@ -11,7 +11,6 @@
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 var utils = ChromeUtils.import("resource://testing-common/mozmill/utils.jsm");
 
 var { close_compose_window, open_compose_new_mail } = ChromeUtils.import(

mail/test/browser/composition/browser_replyFormatFlowed.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var {
   close_compose_window,
   get_msg_source,

mail/test/browser/composition/browser_replyMultipartCharset.js

@@ -25,7 +25,6 @@
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var {
   close_compose_window,

mail/test/browser/composition/browser_sendFormat.js

@@ -9,8 +9,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { close_compose_window, open_compose_with_reply } = ChromeUtils.import(
   "resource://testing-common/mozmill/ComposeHelpers.jsm"
 );

mail/test/browser/content-policy/browser_generalContentPolicy.js

@@ -25,8 +25,6 @@ var elib = ChromeUtils.import(
 var mozmill = ChromeUtils.import(
   "resource://testing-common/mozmill/mozmill.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var {
   close_compose_window,
   open_compose_with_forward,
@@ -326,9 +324,9 @@ function saveAsEMLFile(msgNo) {
     Ci.nsIMessenger
   );
   let profD = Services.dirsvc.get("ProfD", Ci.nsIFile);
-  let file = os.getFileForPath(
-    os.abspath("./content-policy-test-" + msgNo + ".eml", profD)
-  );
+  var file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
+  file.initWithFile(profD);
+  file.append("content-policy-test-" + msgNo + ".eml");
   messenger.saveAs(
     msgHdr.folder.getUriForMsg(msgHdr),
     true,

mail/test/browser/junk-commands/browser_junkCommands.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var {
   be_in_folder,
   create_folder,

mail/test/browser/message-header/browser_phishingBar.js

@@ -11,7 +11,6 @@
 var elementslib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var { gMockExtProtSvcReg } = ChromeUtils.import(
   "resource://testing-common/mozmill/ContentTabHelpers.jsm"

mail/test/browser/message-reader/browser_bug594646.js

@@ -11,8 +11,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { open_message_from_file } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );

mail/test/browser/message-window/browser_commands.js

@@ -10,7 +10,6 @@ var { MailServices } = ChromeUtils.import(
 var elib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var {
   be_in_folder,

mail/test/browser/message-window/browser_emlSubject.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { open_message_from_file } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );

mail/test/browser/message-window/browser_vcardActions.js

@@ -11,7 +11,6 @@
 var elementslib = ChromeUtils.import(
   "resource://testing-common/mozmill/elementslib.jsm"
 );
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
 
 var { get_cards_in_all_address_books_for_email } = ChromeUtils.import(
   "resource://testing-common/mozmill/AddressBookHelpers.jsm"

mail/test/browser/message-window/browser_viewPlaintext.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var { open_message_from_file } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );

mail/test/browser/shared-modules/CloudfileHelpers.jsm

@@ -11,8 +11,6 @@ const EXPORTED_SYMBOLS = [
   "collectFiles",
 ];
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var fdh = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );
@@ -36,8 +34,9 @@ var kDefaults = {
 };
 
 function getFile(aFilename, aRoot) {
-  let path = os.getFileForPath(aRoot);
-  let file = os.getFileForPath(os.abspath(aFilename, path));
+  var file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
+  file.initWithPath(aRoot);
+  file.append(aFilename);
   Assert.ok(file.exists, "File " + aFilename + " does not exist.");
   return file;
 }

mail/test/browser/smime/browser_multipartAlternative.js

@@ -10,8 +10,6 @@
 
 "use strict";
 
-var os = ChromeUtils.import("resource://testing-common/mozmill/os.jsm");
-
 var {
   close_compose_window,
   get_msg_source,