Bug 855730 - Remove failing test so that we can re-enable the rest of the tests here. r=smaug

Author: Tanvi Vyas

content/base/test/Makefile.in

@@ -599,6 +599,7 @@ MOCHITEST_FILES_C= \
 		file_mixed_content_main_bug803225.html \
 		file_mixed_content_main_bug803225_websocket_wsh.py \
 		bug803225_test_mailto.html \
+		test_mixed_content_blocker_frameNavigation.html \
 		file_mixed_content_frameNavigation.html \
 		file_mixed_content_frameNavigation_innermost.html \
 		file_mixed_content_frameNavigation_grandchild.html \
@@ -664,9 +665,6 @@ MOCHITEST_FILES_PARTS = $(foreach s,A B C,MOCHITEST_FILES_$(s))
 #		test_XHR_timeout.js \
 #		file_XHR_timeout.sjs \
 
-# Disabled for frequent failures (bug 855730).
-#		test_mixed_content_blocker_frameNavigation.html \
-
 MOCHITEST_BROWSER_FILES = \
 		browser_bug593387.js \
 		$(NULL)

content/base/test/file_mixed_content_frameNavigation_secure.html

@@ -60,16 +60,7 @@
 
   setTimeout(navigationStatus, TIMEOUT_INTERVAL, iframe_test1);
 
-  // Test 2: Navigate secure grandchild iframe to insecure grandchild iframe on a page that has at least one secure parent (in this example, both the parent and grandparent are https)
-
-  var iframe_test2 = document.createElement("iframe");
-  iframe_test2.src = "https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_secure_grandchild.html";
-  iframe_test2.onerror = function() {
-    parent.postMessage({"test": "securePage_navigate_grandchild", "msg": "got an onerror event when loading or navigating testing iframe"}, "http://mochi.test:8888");
-  };
-  testContent.appendChild(iframe_test2);
-
-  // Test 3: Open an http page in a new tab from a link click with target=_blank.
+  // Test 2: Open an http page in a new tab from a link click with target=_blank.
   var iframe_test3 = document.createElement("iframe");
   iframe_test3.src = "https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_blankTarget.html";
   iframe_test3.onerror = function() {

content/base/test/test_mixed_content_blocker_frameNavigation.html

@@ -25,7 +25,6 @@
 
   var testsToRunSecure = {
     securePage_navigate_child: false,
-    securePage_navigate_grandchild: false,
     blankTarget: false,
   };
 
@@ -105,11 +104,6 @@
         testsToRunSecure["securePage_navigate_child"] = true;
         break;
 
-      case "securePage_navigate_grandchild":
-        ok(blockActive == (event.data.msg == "navigating to insecure grandchild iframe blocked on secure page"), "navigated to insecure granchild iframe on secure page");
-        testsToRunSecure["securePage_navigate_grandchild"] = true;
-        break;
-
       case "blankTarget":
         ok((event.data.msg == "opened an http link with target=_blank from a secure page"), "couldn't open an http link in a new window from a secure page");
         testsToRunSecure["blankTarget"] = true;