Bug 1617887 - part6 - inline strings.jsm usage. r=khushil
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sat, 07 Mar 2020 11:57:10 +0200
changeset 37501 89e4f92cad8f417e0689f72c78eea6d867b7f11e
parent 37500 163fe0f39164fb15af1d273b1e783e67c773a91d
child 37502 71e02e54a7f332976b8c4a658ae30e8f2db08c06
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhushil
bugs1617887
Bug 1617887 - part6 - inline strings.jsm usage. r=khushil
mail/test/browser/shared-modules/elementslib.jsm
mail/test/browser/shared-modules/moz.build
mail/test/browser/shared-modules/strings.jsm
--- a/mail/test/browser/shared-modules/elementslib.jsm
+++ b/mail/test/browser/shared-modules/elementslib.jsm
@@ -45,19 +45,22 @@ var EXPORTED_SYMBOLS = [
   "Name",
   "Lookup",
   "_byID",
   "_byName",
   "_byAttrib",
 ];
 
 var utils = ChromeUtils.import("resource://testing-common/mozmill/utils.jsm");
-var strings = ChromeUtils.import(
-  "resource://testing-common/mozmill/strings.jsm"
-);
+
+var vslice = function(str, svalue, evalue) {
+  var sindex = str.indexOf(svalue);
+  var eindex = str.lastIndexOf(evalue);
+  return str.slice(sindex + 1, eindex);
+};
 
 var countQuotes = function(str) {
   var count = 0;
   var i = 0;
   while (i < str.length) {
     i = str.indexOf('"', i);
     if (i != -1) {
       count++;
@@ -396,47 +399,44 @@ Lookup.prototype.getNode = function() {
       return parent.shadowRoot;
     }
 
     // Handle case where only index is provided
     var cases = nCases;
 
     // Handle ending index before any of the expression gets mangled
     if (exp.endsWith("]")) {
-      var expIndex = JSON.parse(strings.vslice(exp, "[", "]"));
+      var expIndex = JSON.parse(vslice(exp, "[", "]"));
     }
     if (exp.startsWith("[")) {
       let obj;
       try {
-        obj = JSON.parse(strings.vslice(exp, "[", "]"));
+        obj = JSON.parse(vslice(exp, "[", "]"));
       } catch (err) {
         throw new Error(
-          err +
-            ". String to be parsed was || " +
-            strings.vslice(exp, "[", "]") +
-            " ||"
+          err + ". String to be parsed was || " + vslice(exp, "[", "]") + " ||"
         );
       }
       var r = cases.index(_document, parent, obj);
       if (r == null) {
         throw new Error('Expression "' + exp + '" returned null.');
       }
       return r;
     }
 
     for (var c in cases) {
       if (exp.startsWith(c)) {
         let obj;
         try {
-          obj = JSON.parse(strings.vslice(exp, "(", ")"));
+          obj = JSON.parse(vslice(exp, "(", ")"));
         } catch (err) {
           throw new Error(
             err +
               ". String to be parsed was || " +
-              strings.vslice(exp, "(", ")") +
+              vslice(exp, "(", ")") +
               "  ||"
           );
         }
         var result = cases[c](_document, parent, obj);
       }
     }
 
     if (!result) {
--- a/mail/test/browser/shared-modules/moz.build
+++ b/mail/test/browser/shared-modules/moz.build
@@ -31,13 +31,12 @@ TESTING_JS_MODULES.mozmill += [
     'NNTPHelpers.jsm',
     'NotificationBoxHelpers.jsm',
     'os.jsm',
     'PrefTabHelpers.jsm',
     'PromptHelpers.jsm',
     'QuickFilterBarHelpers.jsm',
     'SearchWindowHelpers.jsm',
     'securable-module.jsm',
-    'strings.jsm',
     'SubscribeWindowHelpers.jsm',
     'utils.jsm',
     'WindowHelpers.jsm',
 ]
deleted file mode 100644
--- a/mail/test/browser/shared-modules/strings.jsm
+++ /dev/null
@@ -1,44 +0,0 @@
-// ***** BEGIN LICENSE BLOCK *****// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is Mozilla Corporation Code.
-//
-// The Initial Developer of the Original Code is
-// Mikeal Rogers.
-// Portions created by the Initial Developer are Copyright (C) 2008
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//  Mikeal Rogers <mikeal.rogers@gmail.com>
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-// ***** END LICENSE BLOCK *****
-
-var EXPORTED_SYMBOLS = ["vslice"];
-
-var vslice = function(str, svalue, evalue) {
-  var sindex = str.indexOf(svalue);
-  var eindex = str.lastIndexOf(evalue);
-  return str.slice(sindex + 1, eindex);
-};