Bug 1352572 - Refactor getEmbed() in pluginstream.js; r?bsmedberg draft
authorLie Ryan <lie.1296@gmail.com>
Fri, 07 Apr 2017 11:30:52 +0000
changeset 569523 f0dd230e85b6baa346c66679a071be8e6f1f75f5
parent 569522 0b69bd8646896c719444e4b2398269ba857dc504
child 569524 43248d7bc0c54f6c1edad1f5395dc3cfb92e2d28
push id56209
push userbmo:lie.1296@gmail.com
push dateThu, 27 Apr 2017 16:02:13 +0000
reviewersbsmedberg
bugs1352572
milestone55.0a1
Bug 1352572 - Refactor getEmbed() in pluginstream.js; r?bsmedberg This method will be used in a future commit. MozReview-Commit-ID: GNL4VBJO2nt
dom/plugins/test/mochitest/pluginstream.js
--- a/dom/plugins/test/mochitest/pluginstream.js
+++ b/dom/plugins/test/mochitest/pluginstream.js
@@ -1,20 +1,13 @@
   SimpleTest.waitForExplicitFinish();
 
   function frameLoaded(finishWhenCalled = true, lastObject = false) {
     var testframe = document.getElementById('testframe');
-    function getNode(list) {
-      if (list.length === 0)
-        return undefined;
-      return lastObject ? list[list.length - 1] : list[0];
-    }
-    var embed = getNode(document.getElementsByTagName('embed'));
-    if (undefined === embed)
-      embed = getNode(document.getElementsByTagName('object'));
+    var embed = getEmbed(lastObject);
 
     // In the file:// URI case, this ends up being cross-origin.
     // Skip these checks in that case.
     if (testframe.contentDocument) {
       var content = testframe.contentDocument.body.innerHTML;
       if (!content.length)
         return;
 
@@ -32,8 +25,20 @@
          "content doesn't match");
     }
 
     is(embed.getError(), "pass", "plugin reported error");
     if (finishWhenCalled) {
       SimpleTest.finish();
     }
   }
+
+  function getEmbed(lastObject = false) {
+    function getNode(list) {
+      if (list.length === 0)
+        return undefined;
+      return lastObject ? list[list.length - 1] : list[0];
+    }
+    var embed = getNode(document.getElementsByTagName('embed'));
+    if (undefined === embed)
+      embed = getNode(document.getElementsByTagName('object'));
+    return embed;
+  }