Bug 1261842 - Make pageloader assume that initial browsers are remote in e10s mode. r=jmaher

MozReview-Commit-ID: 4l2uTqOeIy2

--HG--
extra : rebase_source : b13fa6669b34965be9b18bb658517a2fe4795542
extra : source : 0a08398b508752250588f9b46726ad90ec51637b

testing/talos/talos/pageloader/chrome/pageloader.js

@@ -229,12 +229,11 @@ function plInit() {
         // able to resize the window and not have it get clobbered
         // by the persisted values
         setTimeout(function () {
-                     // For e10s windows, the initial browser is not remote until it attempts to
-                     // browse to a URI that should be remote (landed at bug 1047603).
-                     // However, when it loads such URI and reinitialize as remote, we lose the
+                     // For e10s windows, since bug 1261842, the initial browser is remote unless
+                     // it attempts to browse to a URI that should be non-remote (landed at bug 1047603).
+                     //
+                     // However, when it loads such URI and reinitializes as non-remote, we lose the
                      // load listener and the injected tpRecordTime.
-                     // The same thing happens if the initial browser starts as remote but the
-                     // first page is not-remote (such as with TART/CART which load a chrome URI).
                      //
                      // The preferred pageloader behaviour in e10s is to run the pages as as remote,
                      // so if the page can load as remote, we will load it as remote.
@@ -244,9 +243,9 @@ function plInit() {
                      // pages should be able to load in the same mode as the initial page - due
                      // to this reinitialization on the switch.
                      if (browserWindow.gMultiProcessBrowser) {
-                       if (firstPageCanLoadAsRemote())
-                         browserWindow.XULBrowserWindow.forceInitialBrowserRemote();
-                       // Implicit else: initial browser in e10s is non-remote by default.
+                       if (!firstPageCanLoadAsRemote())
+                         browserWindow.XULBrowserWindow.forceInitialBrowserNonRemote();
+                       // Implicit else: initial browser in e10s is remote by default.
                      }
 
                      browserWindow.resizeTo(winWidth, winHeight);

testing/talos/talos/pageloader/install.rdf

@@ -4,7 +4,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>pageloader@mozilla.org</em:id>
-    <em:version>1.0.9</em:version>
+    <em:version>1.0.10</em:version>
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>