Bug 1375833 - Part 4.2 - Fix session store test case. r=mikedeboer

Previously gecko would drop all subframe history entries on reloading if there
exists one or more dynamic subframes. With bug 1326251 and this bug, now that
dynamic frame entries are bound to bfcache (so they're still dropped on
reloading) but static entries are always kept in normal reloads.

Force reload would still drop all subframes regardless they're static or
dynamic, so for this test case I think we should just use a force reload.

MozReview-Commit-ID: 2mZZa59RMHB

--HG--
extra : rebase_source : 188b27f9566ce0652ca92c7765761ad3fd0b8c99

browser/components/sessionstore/test/browser_705597.js

@@ -42,11 +42,11 @@ function test() {
           waitForBrowserState(blankState, finish);
         });
 
-        // reload the browser to deprecate the subframes
-        browser.reload();
+        // Force reload the browser to deprecate the subframes.
+        browser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
       });
 
-      // create a dynamic subframe
+      // Create a dynamic subframe.
       let doc = browser.contentDocument;
       let iframe = doc.createElement("iframe");
       doc.body.appendChild(iframe);

browser/components/sessionstore/test/browser_707862.js

@@ -41,11 +41,11 @@ function test() {
           });
         });
 
-        // reload the browser to deprecate the subframes
-        browser.reload();
+        // Force reload the browser to deprecate the subframes.
+        browser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
       });
 
-      // create a dynamic subframe
+      // Create a dynamic subframe.
       let doc = browser.contentDocument;
       let iframe = doc.createElement("iframe");
       doc.body.appendChild(iframe);