Bug 1261842 - browser_bug495058.js no longer needs to wait for remoteness flip on initial browser of new window. r=Felipe,Gijs
authorMike Conley <mconley@mozilla.com>
Wed, 08 Jun 2016 16:42:04 -0400
changeset 346283 9d70d39a5ebb2f2ed39ebebdd344dfcceccc363e
parent 346282 b45911deab9bb3ec956228d7c5d26b6f4e7880d1
child 346284 fd8faeae82a4a51188756f169e71dc5e3a88acfa
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFelipe, Gijs
bugs1261842, 495058
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1261842 - browser_bug495058.js no longer needs to wait for remoteness flip on initial browser of new window. r=Felipe,Gijs MozReview-Commit-ID: Fl1OIsluS56
browser/base/content/test/general/browser_bug495058.js
--- a/browser/base/content/test/general/browser_bug495058.js
+++ b/browser/base/content/test/general/browser_bug495058.js
@@ -23,26 +23,16 @@ add_task(function*() {
     // browser element. We'll handle the e10s case in the next block.
     let contentPainted = BrowserTestUtils.waitForEvent(tab.linkedBrowser,
                                                        "MozAfterPaint");
 
     let delayedStartup =
       TestUtils.topicObserved("browser-delayed-startup-finished",
                               subject => subject == win);
 
-    if (gMultiProcessBrowser &&
-        E10SUtils.canLoadURIInProcess(uri, Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT)) {
-      // Until bug 1261842 is fixed, the initial browser is going to be
-      // non-remote. If we're transitioning to a URL that can be loaded
-      // remotely, we'll need to wait until that remoteness switch is done
-      // before we send any framescripts down to the browser.
-      yield BrowserTestUtils.waitForEvent(tab, "TabRemotenessChange");
-      contentPainted = BrowserTestUtils.contentPainted(tab.linkedBrowser);
-    }
-
     yield Promise.all([delayedStartup, contentPainted]);
 
     Assert.equal(win.gBrowser.currentURI.spec, uri, uri + ": uri loaded in detached tab");
     Assert.equal(win.document.activeElement, win.gBrowser.selectedBrowser, uri + ": browser is focused");
     Assert.equal(win.gURLBar.value, "", uri + ": urlbar is empty");
     Assert.ok(win.gURLBar.placeholder, uri + ": placeholder text is present");
 
     yield BrowserTestUtils.closeWindow(win);