Bug 1346286 - Remove CPOWs from browser_bug749738.js. r=Felipe draft
authorBlake Kaplan <mrbkap@gmail.com>
Thu, 09 Mar 2017 10:33:05 -0800
changeset 499547 3cf6bf2c48622e9c9af2ed473e40f791ab2b414a
parent 499546 4343d59563b60a4b32dd904b7be14a86ff126002
child 499548 3ee9ee96a2e87a96e411a720737fbade0581de3f
push id49450
push userbmo:mrbkap@mozilla.com
push dateWed, 15 Mar 2017 23:51:54 +0000
reviewersFelipe
bugs1346286, 749738
milestone55.0a1
Bug 1346286 - Remove CPOWs from browser_bug749738.js. r=Felipe MozReview-Commit-ID: 3gKvozefXY9
browser/base/content/test/general/browser_bug749738.js
--- a/browser/base/content/test/general/browser_bug749738.js
+++ b/browser/base/content/test/general/browser_bug749738.js
@@ -7,29 +7,23 @@
 const DUMMY_PAGE = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
 
 function test() {
   waitForExplicitFinish();
 
   let tab = gBrowser.addTab();
   gBrowser.selectedTab = tab;
 
-  load(tab, DUMMY_PAGE, function() {
+  BrowserTestUtils.loadURI(tab.linkedBrowser, DUMMY_PAGE);
+  BrowserTestUtils.browserLoaded(tab.linkedBrowser).then(() => {
     gFindBar.onFindCommand();
     EventUtils.sendString("Dummy");
     gBrowser.removeTab(tab);
 
     try {
       gFindBar.close();
       ok(true, "findbar.close should not throw an exception");
     } catch (e) {
       ok(false, "findbar.close threw exception: " + e);
     }
     finish();
   });
 }
-
-function load(aTab, aUrl, aCallback) {
-  aTab.linkedBrowser.addEventListener("load", function(aEvent) {
-    waitForFocus(aCallback, content);
-  }, {capture: true, once: true});
-  aTab.linkedBrowser.loadURI(aUrl);
-}