Bug 899080 - Test fixup part 4 - content. r=smaug
authorGeorg Fritzsche <georg.fritzsche@googlemail.com>
Wed, 04 Sep 2013 16:07:52 +0200
changeset 145520 af8b8c91286c2279b5f3b4fd37466f1cedb0f1fb
parent 145519 4b9221731b0e413c9b0bf55336823833b55f196c
child 145521 1332d461d52ec7febce82c286011b5933ad7216d
push id33305
push usergeorg.fritzsche@googlemail.com
push dateWed, 04 Sep 2013 21:10:31 +0000
treeherdermozilla-inbound@1e63861a73d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs899080
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 899080 - Test fixup part 4 - content. r=smaug
content/base/test/test_mixed_content_blocker.html
content/base/test/test_object.html
--- a/content/base/test/test_mixed_content_blocker.html
+++ b/content/base/test/test_mixed_content_blocker.html
@@ -6,16 +6,25 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <meta charset="utf-8">
   <title>Tests for Bug 62178</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script>
+  var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+  var tags = ph.getPluginTags();
+  for (var tag of tags) {
+    if (tag.name == "Test Plug-in") {
+      tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+    }
+  }
+
 
   var origBlockDisplay = SpecialPowers.getBoolPref("security.mixed_content.block_display_content");
   var origBlockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
 
   var counter = 0;
   var settings = [ [true, true], [true, false], [false, true], [false, false] ];
 
   var blockActive;
--- a/content/base/test/test_object.html
+++ b/content/base/test/test_object.html
@@ -6,16 +6,25 @@
     <script type="application/javascript" src="/tests/SimpleTest/SpecialPowers.js"></script>
     <meta charset="utf-8">
   <body onload="onLoad()">
     <script class="testbody" type="text/javascript;version=1.8">
 
       "use strict";
       SimpleTest.waitForExplicitFinish();
 
+      var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                        .getService(SpecialPowers.Ci.nsIPluginHost);
+      var pluginTags = pluginHost.getPluginTags();
+      for (var tag of pluginTags) {
+        if (tag.name == "Test Plug-in") {
+          tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
+        }
+      }
+
       // This can go away once embed also is on WebIDL
       let OBJLC = SpecialPowers.Ci.nsIObjectLoadingContent;
 
       // Use string modes in this test to make the test easier to read/debug.
       // nsIObjectLoadingContent refers to this as "type", but I am using "mode"
       // in the test to avoid confusing with content-type.
       let prettyModes = {};
       prettyModes[OBJLC.TYPE_LOADING] = "loading";