Bug 855443 - Assertion failure in nsSHEntry.cpp, don't just append a new SHEntry to parent if we already have an SHEntry for the loading page, r=bz

--HG--
extra : rebase_source : 8f8d0df030a3205d9d9845e90c849bf94115ff1b

content/base/test/test_bug527896.html

@@ -22,8 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=527896
 
 SimpleTest.waitForExplicitFinish();
 
-SimpleTest.expectAssertions(1);
-
 var docWrittenSrcExecuted = false;
 var scriptInsertedSrcExecuted = false;
 

content/html/content/test/forms/test_meter_element.html

@@ -21,12 +21,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=657938
 <pre id="test">
 <script type="application/javascript">
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1);
-} else {
-  SimpleTest.expectAssertions(1);
-}
-
 /** Test for <meter> **/
 
 function checkFormIDLAttribute(aElement)

content/html/content/test/test_bug242709.html

@@ -17,8 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=242709
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(1);
-
 /** Test for Bug 242709 **/
 
 SimpleTest.waitForExplicitFinish();

content/html/content/test/test_bug277890.html

@@ -17,8 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=277890
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(1);
-
 /** Test for Bug 277890 **/
 
 SimpleTest.waitForExplicitFinish();

content/html/content/test/test_bug523771.html

@@ -20,12 +20,6 @@ method="POST" enctype="multipart/form-data">
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1);
-} else {
-  SimpleTest.expectAssertions(1);
-}
-
 var filesToKill = [];
 singleFileInput = document.getElementById('singleFile');
 multiFileInput = document.getElementById('multiFile');

content/html/content/test/test_iframe_sandbox_inheritance.html

@@ -14,9 +14,6 @@ Implement HTML5 sandbox attribute for IFRAMEs - inheritance tests
 /** Test for Bug 341604 - Implement HTML5 sandbox attribute for IFRAMEs **/
 /** Inheritance Tests **/
 
-// Assertion failure in docshell/shistory/src/nsSHEntry.cpp (currently line 625).
-// Bug 901876 raised.
-SimpleTest.expectAssertions(1);
 SimpleTest.waitForExplicitFinish();
 
 // A postMessage handler that is used by sandboxed iframes without

content/html/content/test/test_iframe_sandbox_navigation.html

@@ -15,7 +15,6 @@ Implement HTML5 sandbox attribute for IFRAMEs
 /** Test for Bug 341604 - Implement HTML5 sandbox attribute for IFRAMEs **/
 /** Navigation tests Part 1**/
 
-SimpleTest.expectAssertions(1, 3);
 SimpleTest.waitForExplicitFinish();
 // a postMessage handler that is used by sandboxed iframes without
 // 'allow-same-origin'/other windows to communicate pass/fail back to this main page.

content/html/document/test/test_bug448564.html

@@ -20,8 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=448564
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(3);
-
 /** Test for Bug 448564 **/
 
 /**

content/html/document/test/test_bug478251.html

@@ -17,8 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478251
 <pre id="test">
 <script type="application/javascript">
 
-SimpleTest.expectAssertions(9, 10);
-
 /** Test for Bug 478251 **/
 var doc = $("t").contentDocument;
 doc.open();

docshell/base/nsDocShell.cpp

@@ -4195,7 +4195,7 @@ nsDocShell::AddChildSHEntry(nsISHEntry * aCloneRef, nsISHEntry * aNewEntry,
 {
     nsresult rv;
 
-    if (mLSHE && loadType != LOAD_PUSHSTATE) {
+    if (mLSHE && loadType != LOAD_PUSHSTATE && !aCloneRef) {
         /* You get here if you are currently building a 
          * hierarchy ie.,you just visited a frameset page
          */

docshell/test/test_bug580069.html

@@ -16,8 +16,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=580069
 
 <script type="application/javascript">
 
-SimpleTest.expectAssertions(1);
-
 SimpleTest.waitForExplicitFinish();
 
 var iframe = document.getElementById('iframe');

js/xpconnect/tests/mochitest/test_bug393269.html

@@ -14,8 +14,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=393269
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(1, 2);
-
 (function () {
     /** Test for Bug 393269 **/
     var doc = $("ifr").contentDocument;

toolkit/components/passwordmgr/test/test_notifications.html

@@ -18,8 +18,6 @@ Login Manager test: notifications
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-SimpleTest.expectAssertions(23);
-
 /** Test for Login Manager: notifications. **/
 
 // Set testpath to the directory where we live. Used to load tests from