Bug 1485305 - browser/ tests Ensure loadURI always passes a triggeringPrincipal() r=Mossop

Differential Revision: https://phabricator.services.mozilla.com/D4552

--HG--
extra : source : 2cf17e4974823d09d0fdd1aef64e69e840b288a1

Author: Jonathan Kingston

browser/base/content/test/favicons/browser_favicon_change.js

@@ -10,7 +10,7 @@ add_task(async function() {
   let extraTab = gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
   let haveChanged = waitForFavicon(extraTab.linkedBrowser, TEST_ROOT + "file_bug970276_favicon1.ico");
 
-  extraTab.linkedBrowser.loadURI(TEST_URL);
+  BrowserTestUtils.loadURI(extraTab.linkedBrowser, TEST_URL);
   await BrowserTestUtils.browserLoaded(extraTab.linkedBrowser);
   await haveChanged;
 

browser/base/content/test/favicons/browser_favicon_change_not_in_document.js

@@ -27,7 +27,7 @@ add_task(async function() {
   let expectedFavicon = TEST_ROOT + "file_generic_favicon.ico";
   let faviconPromise = waitForFavicon(extraTab.linkedBrowser, expectedFavicon);
 
-  extraTab.linkedBrowser.loadURI(TEST_URL);
+  BrowserTestUtils.loadURI(extraTab.linkedBrowser, TEST_URL);
   await BrowserTestUtils.browserLoaded(extraTab.linkedBrowser);
 
   await faviconPromise;

browser/base/content/test/general/browser_alltabslistener.js

@@ -97,8 +97,8 @@ function test() {
     BrowserTestUtils.browserStopped(gBackgroundBrowser, kBasePage),
     BrowserTestUtils.browserStopped(gForegroundBrowser, kBasePage),
   ];
-  gBackgroundBrowser.loadURI(kBasePage);
-  gForegroundBrowser.loadURI(kBasePage);
+  BrowserTestUtils.loadURI(gBackgroundBrowser, kBasePage);
+  BrowserTestUtils.loadURI(gForegroundBrowser, kBasePage);
   Promise.all(promises).then(startTest1);
 }
 
@@ -107,7 +107,7 @@ function runTest(browser, url, next) {
   gAllNotificationsPos = 0;
   gNextTest = next;
   gTestBrowser = browser;
-  browser.loadURI(url);
+  BrowserTestUtils.loadURI(browser, url);
 }
 
 function startTest1() {

browser/base/content/test/general/browser_bug417483.js

@@ -1,7 +1,7 @@
 add_task(async function() {
   let loadedPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, true);
   const htmlContent = "data:text/html, <iframe src='data:text/html,text text'></iframe>";
-  gBrowser.loadURI(htmlContent);
+  BrowserTestUtils.loadURI(gBrowser, htmlContent);
   await loadedPromise;
 
   await ContentTask.spawn(gBrowser.selectedBrowser, { }, async function(arg) {

browser/base/content/test/general/browser_bug431826.js

@@ -6,7 +6,7 @@ add_task(async function() {
   gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
 
   let promise = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-  gBrowser.loadURI("https://nocert.example.com/");
+  BrowserTestUtils.loadURI(gBrowser, "https://nocert.example.com/");
   await promise;
 
   await remote(() => {

browser/base/content/test/general/browser_bug519216.js

@@ -3,7 +3,7 @@ function test() {
   gBrowser.addProgressListener(progressListener1);
   gBrowser.addProgressListener(progressListener2);
   gBrowser.addProgressListener(progressListener3);
-  gBrowser.loadURI("data:text/plain,bug519216");
+  BrowserTestUtils.loadURI(gBrowser, "data:text/plain,bug519216");
 }
 
 var calledListener1 = false;

browser/base/content/test/general/browser_bug567306.js

@@ -15,7 +15,9 @@ add_task(async function() {
       ok(true, "pageshow listener called: " + newwindow.gBrowser.currentURI.spec);
       resolve();
     });
-    selectedBrowser.loadURI("data:text/html,<h1 id='h1'>Select Me</h1>");
+    selectedBrowser.loadURI("data:text/html,<h1 id='h1'>Select Me</h1>", {
+      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+    });
   });
 
   await SimpleTest.promiseFocus(newwindow);

browser/base/content/test/general/browser_bug579872.js

@@ -24,5 +24,5 @@ function test() {
     gBrowser.removeTab(gBrowser.tabs[1]); // example.org tab
     finish();
   }
-  newTab.linkedBrowser.loadURI("http://example.com");
+  BrowserTestUtils.loadURI(newTab.linkedBrowser, "http://example.com");
 }

browser/base/content/test/general/browser_bug581253.js

@@ -24,7 +24,7 @@ add_task(async function test_remove_bookmark_with_tag_via_edit_bookmark() {
 
   Assert.ok(await PlacesUtils.bookmarks.fetch({url: testURL}), "the test url is bookmarked");
 
-  gBrowser.loadURI(testURL);
+  BrowserTestUtils.loadURI(gBrowser, testURL);
 
   await BrowserTestUtils.waitForCondition(
     () => BookmarkingUI.status == BookmarkingUI.STATUS_STARRED,

browser/base/content/test/general/browser_bug624734.js

@@ -30,5 +30,5 @@ function test() {
     }
   });
 
-  tab.linkedBrowser.loadURI("http://example.com/browser/browser/base/content/test/general/dummy_page.html");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/browser/browser/base/content/test/general/dummy_page.html");
 }

browser/base/content/test/general/browser_bug734076.js

@@ -91,7 +91,7 @@ add_task(async function() {
 
   for (let test of tests) {
     let loadedPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-    gBrowser.loadURI(test.url);
+    BrowserTestUtils.loadURI(gBrowser, test.url);
     await loadedPromise;
 
     info("Run subtest " + test.name);

browser/base/content/test/general/browser_documentnavigation.js

@@ -82,7 +82,7 @@ async function expectFocusOnF6(backward, expectedDocument, expectedElement, onCo
 // Load a page and navigate between it and the chrome window.
 add_task(async function() {
   let page1Promise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-  gBrowser.selectedBrowser.loadURI(testPage1);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, testPage1);
   await page1Promise;
 
   // When the urlbar is focused, pressing F6 should focus the root of the content page.

browser/base/content/test/general/browser_e10s_chrome_process.js

@@ -14,7 +14,7 @@ function makeTest(name, startURL, startProcessIsRemote, endURL, endProcessIsRemo
 
     // Load the initial URL and make sure we are in the right initial process
     info("Loading initial URL");
-    browser.loadURI(startURL);
+    BrowserTestUtils.loadURI(browser, startURL);
     await BrowserTestUtils.browserLoaded(browser);
 
     is(browser.currentURI.spec, startURL, "Shouldn't have been redirected");

browser/base/content/test/general/browser_e10s_switchbrowser.js

@@ -48,6 +48,7 @@ var check_history = async function() {
 
   for (let i = 0; i < count; i++) {
     let entry = sessionHistory.entries[i];
+    info("Checking History Entry:", entry.uri);
     is(entry.uri, gExpectedHistory.entries[i].uri, "Should have the right URI");
     is(entry.title, gExpectedHistory.entries[i].title, "Should have the right title");
   }
@@ -77,7 +78,10 @@ var waitForLoad = async function(uri) {
 // Waits for a load and updates the known history
 var waitForLoadWithFlags = async function(uri, flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE) {
   info("Loading " + uri + " flags = " + flags);
-  gBrowser.selectedBrowser.loadURI(uri, { flags });
+  gBrowser.selectedBrowser.loadURI(uri, {
+    flags,
+    triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+  });
 
   await BrowserTestUtils.browserStopped(gBrowser);
   if (!(flags & Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_HISTORY)) {

browser/base/content/test/general/browser_findbarClose.js

@@ -12,7 +12,7 @@ add_task(async function findbar_test() {
   let promise = ContentTask.spawn(newTab.linkedBrowser, null, async function() {
     await ContentTaskUtils.waitForEvent(this, "DOMContentLoaded", false);
   });
-  newTab.linkedBrowser.loadURI("http://example.com/browser/" +
+  BrowserTestUtils.loadURI(newTab.linkedBrowser, "http://example.com/browser/" +
     "browser/base/content/test/general/test_bug628179.html");
   await promise;
 

browser/base/content/test/general/browser_refreshBlocker.js

@@ -91,7 +91,7 @@ async function testRealRefresh(refreshPage, delay) {
   }, async function(browser) {
     await pushPrefs(["accessibility.blockautorefresh", true]);
 
-    browser.loadURI(refreshPage + "?p=" + TARGET_PAGE + "&d=" + delay);
+    BrowserTestUtils.loadURI(browser, refreshPage + "?p=" + TARGET_PAGE + "&d=" + delay);
     await BrowserTestUtils.browserLoaded(browser);
 
     // Once browserLoaded resolves, all nsIWebProgressListener callbacks

browser/base/content/test/general/browser_restore_isAppTab.js

@@ -62,7 +62,7 @@ add_task(async function navigate() {
   isAppTab = await isBrowserAppTab(browser);
   ok(isAppTab, "Docshell should think it is an app tab");
 
-  gBrowser.loadURI(DUMMY);
+  BrowserTestUtils.loadURI(gBrowser, DUMMY);
   await BrowserTestUtils.browserStopped(gBrowser);
   loadFrameScript(browser);
   isAppTab = await isBrowserAppTab(browser);
@@ -76,7 +76,7 @@ add_task(async function navigate() {
   isAppTab = await isBrowserAppTab(browser);
   ok(isAppTab, "Docshell should think it is an app tab");
 
-  gBrowser.loadURI("about:robots");
+  BrowserTestUtils.loadURI(gBrowser, "about:robots");
   await BrowserTestUtils.browserStopped(gBrowser);
   loadFrameScript(browser);
   isAppTab = await isBrowserAppTab(browser);

browser/base/content/test/general/browser_save_link-perwindowpb.js

@@ -14,7 +14,7 @@ function triggerSave(aWindow, aCallback) {
   let testBrowser = aWindow.gBrowser.selectedBrowser;
   // This page sets a cookie if and only if a cookie does not exist yet
   let testURI = "http://mochi.test:8888/browser/browser/base/content/test/general/bug792517-2.html";
-  testBrowser.loadURI(testURI);
+  BrowserTestUtils.loadURI(testBrowser, testURI);
   BrowserTestUtils.browserLoaded(testBrowser, false, testURI)
                   .then(() => {
     waitForFocus(function() {

browser/base/content/test/general/browser_save_link_when_window_navigates.js

@@ -29,7 +29,7 @@ function triggerSave(aWindow, aCallback) {
   let testBrowser = aWindow.gBrowser.selectedBrowser;
   let testURI = "http://mochi.test:8888/browser/browser/base/content/test/general/navigating_window_with_download.html";
   windowObserver.setCallback(onUCTDialog);
-  testBrowser.loadURI(testURI);
+  BrowserTestUtils.loadURI(testBrowser, testURI);
 
   // Create the folder the link will be saved into.
   var destDir = createTemporarySaveDirectory();

browser/base/content/test/general/browser_save_video.js

@@ -12,7 +12,7 @@ add_task(async function() {
   var fileName;
 
   let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-  gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html");
+  BrowserTestUtils.loadURI(gBrowser, "http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html");
   await loadPromise;
 
   let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");

browser/base/content/test/general/browser_ssl_error_reports.js

@@ -64,7 +64,7 @@ async function testSendReportAutomatically(testURL, suffix, errorURISuffix) {
 
   // Load the page and wait for the error report submission.
   let promiseStatus = createReportResponseStatusPromise(URL_REPORTS + suffix);
-  browser.loadURI(testURL);
+  BrowserTestUtils.loadURI(browser, testURL);
   await BrowserTestUtils.waitForErrorPage(browser);
 
   ok(!isErrorStatus(await promiseStatus),
@@ -88,7 +88,7 @@ async function testSetAutomatic(testURL, suffix, errorURISuffix) {
   let browser = tab.linkedBrowser;
 
   // Load the page.
-  browser.loadURI(testURL);
+  BrowserTestUtils.loadURI(browser, testURL);
   await BrowserTestUtils.waitForErrorPage(browser);
 
   // Check that we loaded the right error page.
@@ -129,7 +129,7 @@ async function testSendReportDisabled(testURL, errorURISuffix) {
   let browser = tab.linkedBrowser;
 
   // Load the page.
-  browser.loadURI(testURL);
+  BrowserTestUtils.loadURI(browser, testURL);
   await BrowserTestUtils.waitForErrorPage(browser);
 
   // Check that we loaded the right error page.

browser/base/content/test/general/browser_star_hsts.js

@@ -68,6 +68,6 @@ function promiseTabLoadEvent(aTab, aURL, aFinalURL) {
     aFinalURL = aURL;
 
   info("Wait for load tab event");
-  aTab.linkedBrowser.loadURI(aURL);
+  BrowserTestUtils.loadURI(aTab.linkedBrowser, aURL);
   return BrowserTestUtils.browserLoaded(aTab.linkedBrowser, false, aFinalURL);
 }

browser/base/content/test/general/browser_tab_detach_restore.js

@@ -10,7 +10,7 @@ add_task(async function() {
     SessionStore.forgetClosedWindow(0);
 
   let tab = BrowserTestUtils.addTab(gBrowser);
-  tab.linkedBrowser.loadURI(uri);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
   await TabStateFlusher.flush(tab.linkedBrowser);
 

browser/base/content/test/general/browser_tab_dragdrop.js

@@ -27,7 +27,7 @@ var clickTest = async function(tab) {
 };
 
 function loadURI(tab, url) {
-  tab.linkedBrowser.loadURI(url);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, url);
   return BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 }
 

browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js

@@ -25,7 +25,7 @@ function frame_script() {
  * Promise that resolves when the browser is no longer remote.
  */
 function prepareNonRemoteBrowser(aWindow, browser) {
-  browser.loadURI(NON_REMOTE_PAGE);
+  BrowserTestUtils.loadURI(browser, NON_REMOTE_PAGE);
   return BrowserTestUtils.browserLoaded(browser);
 }
 

browser/base/content/test/general/browser_typeAheadFind.js

@@ -5,7 +5,7 @@
 add_task(async function() {
   let testWindow = await BrowserTestUtils.openNewBrowserWindow();
 
-  testWindow.gBrowser.loadURI("data:text/html,<h1>A Page</h1>");
+  BrowserTestUtils.loadURI(testWindow.gBrowser, "data:text/html,<h1>A Page</h1>");
   await BrowserTestUtils.browserLoaded(testWindow.gBrowser.selectedBrowser);
 
   await SimpleTest.promiseFocus(testWindow.gBrowser.selectedBrowser);

browser/base/content/test/general/browser_unknownContentType_title.js

@@ -21,7 +21,7 @@ add_task(async function() {
 
   is(gBrowser.contentTitle, "Test Page", "Should have the right title.");
 
-  browser.loadURI(unknown_url);
+  BrowserTestUtils.loadURI(browser, unknown_url);
   let win = await waitForNewWindow();
   is(win.location, "chrome://mozapps/content/downloads/unknownContentType.xul",
      "Should have seen the unknown content dialog.");

browser/base/content/test/general/head.js

@@ -303,7 +303,7 @@ var FullZoomHelper = {
           resolve();
       });
 
-      tab.linkedBrowser.loadURI(url);
+      BrowserTestUtils.loadURI(tab.linkedBrowser, url);
     });
   },
 

browser/base/content/test/pageinfo/browser_pageinfo_firstPartyIsolation.js

@@ -74,7 +74,7 @@ async function test() {
   let url = "https://example.com/browser/browser/base/content/test/pageinfo/image.html";
   gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
   let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, url);
-  gBrowser.selectedBrowser.loadURI(url);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
   await loadPromise;
 
   // Pass a dummy imageElement, if there isn't an imageElement, pageInfo.js

browser/base/content/test/pageinfo/browser_pageinfo_image_info.js

@@ -46,5 +46,5 @@ function test() {
     }, {capture: true, once: true});
   });
 
-  gBrowser.loadURI(URI);
+  BrowserTestUtils.loadURI(gBrowser, URI);
 }

browser/base/content/test/pageinfo/browser_pageinfo_images.js

@@ -28,7 +28,7 @@ function test() {
     }, {capture: true, once: true});
   });
 
-  gBrowser.selectedBrowser.loadURI(
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser,
     "data:text/html," +
     "<html>" +
     "  <head>" +

browser/base/content/test/pageinfo/browser_pageinfo_svg_image.js

@@ -35,5 +35,5 @@ function test() {
     }, {capture: true, once: true});
   });
 
-  gBrowser.selectedBrowser.loadURI(URI);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, URI);
 }

browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js

@@ -136,7 +136,7 @@ add_task(async function testChromeHearsPluginCrashFirst() {
   let win = await BrowserTestUtils.openNewBrowserWindow({remote: true});
   let browser = win.gBrowser.selectedBrowser;
 
-  browser.loadURI(CRASH_URL);
+  BrowserTestUtils.loadURI(browser, CRASH_URL);
   await BrowserTestUtils.browserLoaded(browser);
 
   // In this case, we want the <object> to match the -moz-handler-crashed
@@ -205,7 +205,7 @@ add_task(async function testContentHearsCrashFirst() {
   let win = await BrowserTestUtils.openNewBrowserWindow({remote: true});
   let browser = win.gBrowser.selectedBrowser;
 
-  browser.loadURI(CRASH_URL);
+  BrowserTestUtils.loadURI(browser, CRASH_URL);
   await BrowserTestUtils.browserLoaded(browser);
 
   // In this case, we want the <object> to match the -moz-handler-crashed

browser/base/content/test/popupNotifications/head.js

@@ -36,7 +36,7 @@ function promiseTabLoadEvent(tab, url) {
   let browser = tab.linkedBrowser;
 
   if (url) {
-    browser.loadURI(url);
+    BrowserTestUtils.loadURI(browser, url);
   }
 
   return BrowserTestUtils.browserLoaded(browser, false, url);

browser/base/content/test/siteIdentity/browser_check_identity_state.js

@@ -275,7 +275,7 @@ async function noCertErrorTest(secureCheck) {
   gBrowser.selectedTab = newTab;
 
   let promise = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-  gBrowser.loadURI("https://nocert.example.com/");
+  BrowserTestUtils.loadURI(gBrowser, "https://nocert.example.com/");
   await promise;
   is(getIdentityMode(), "unknownIdentity", "Identity should be unknown");
   is(getConnectionState(), "not-secure", "Connection should be file");

browser/base/content/test/siteIdentity/browser_csp_block_all_mixedcontent.js

@@ -40,7 +40,7 @@ function runTests() {
   // Starting the test
   var url = PRE_PATH + "file_csp_block_all_mixedcontent.html";
   BrowserTestUtils.browserLoaded(gTestBrowser, false, url).then(verifyUInotDegraded);
-  gTestBrowser.loadURI(url);
+  BrowserTestUtils.loadURI(gTestBrowser, url);
 }
 
 // ------------------------------------------------------