More orange-fixing. r=yellowish-red

docshell/test/chrome/bug113934_window.xul

@@ -15,8 +15,8 @@
   <script type="application/javascript"><![CDATA[
     var imports = [ "SimpleTest", "is", "isnot", "ok", "snapshotWindow",
                     "compareSnapshots", "onerror" ];
-    for each (var import in imports) {
-      window[import] = window.opener.wrappedJSObject[import];
+    for each (var name in imports) {
+      window[name] = window.opener.wrappedJSObject[name];
     }
 
     function $(id) {

docshell/test/chrome/bug215405_window.xul

@@ -47,8 +47,8 @@
 
   <script type="application/javascript"><![CDATA[
     var imports = [ "SimpleTest", "is", "isnot", "ok"];
-    for each (var import in imports) {
-      window[import] = window.opener.wrappedJSObject[import];
+    for each (var name in imports) {
+      window[name] = window.opener.wrappedJSObject[name];
     }
 
     const text="MOZILLA";

docshell/test/chrome/docshell_helpers.js

@@ -3,8 +3,8 @@
  */
 var imports = [ "SimpleTest", "is", "isnot", "ok", "onerror", "todo", 
   "todo_is", "todo_isnot" ];
-for each (var import in imports) {
-  window[import] = window.opener.wrappedJSObject[import];
+for each (var name in imports) {
+  window[name] = window.opener.wrappedJSObject[name];
 }
 
 /**

layout/reftests/editor/xul/platform.js

@@ -9,7 +9,7 @@ var ua = navigator.userAgent;
 if (/Windows/.test(ua)) {
   id = "win";
   if (/NT 5\.1/.test(ua) || /NT 5\.2; Win64/.test(ua))
-    var class = "winxp";
+    var classname = "winxp";
 }
 else if (/Linux/.test(ua))
   id = "linux";
@@ -24,5 +24,5 @@ else
   document.documentElement.appendChild(
     document.createTextNode("Unrecognized platform")
   );
-if (class)
-  document.documentElement.setAttribute("class", class);
+if (classname)
+  document.documentElement.setAttribute("class", classname);

toolkit/components/ctypes/tests/unit/test_jsctypes.js.in

@@ -82,12 +82,12 @@ function do_check_throws(f, type, stack)
   do_throw("expected " + type.name + " exception, none thrown", stack);
 }
 
-function do_check_class(obj, class, stack)
+function do_check_class(obj, classname, stack)
 {
   if (!stack)
     stack = Components.stack.caller;
 
-  do_check_eq(Object.prototype.toString.call(obj), "[object " + class + "]", stack);
+  do_check_eq(Object.prototype.toString.call(obj), "[object " + classname + "]", stack);
 }
 
 function run_test()