Backed out changeset d2e762d32fb6 (bug 1596738) for mochitest failures on browser_test_textcaret.js. CLOSED TREE

browser/base/content/test/general/browser.ini

@@ -401,6 +401,7 @@ tags = fullscreen
 [browser_newWindowDrop.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_newwindow_focus.js]
+fail-if = fission # URLBar should be focused - [object XULFrameElement] == {} - JS frame :: chrome://mochitests/content/browser/browser/base/content/test/general/browser_newwindow_focus.js :: test_no_steal_focus/< :: line 113
 skip-if = os == "linux" && !e10s # Bug 1263254 - Perma fails on Linux without e10s for some reason.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug1299667.js]

browser/components/sessionstore/SessionStore.jsm

@@ -4936,21 +4936,15 @@ var SessionStoreInternal = {
       }
     }
 
-    let reason =
-      aOptions.restoreContentReason ?? RESTORE_TAB_CONTENT_REASON.SET_STATE;
-
     browser.messageManager.sendAsyncMessage("SessionStore:restoreTabContent", {
       loadArguments,
       isRemotenessUpdate,
-      reason,
+      reason:
+        aOptions.restoreContentReason || RESTORE_TAB_CONTENT_REASON.SET_STATE,
     });
 
     // Focus the tab's content area.
-    if (
-      aTab.selected &&
-      !window.isBlankPageURL(uri) &&
-      reason !== RESTORE_TAB_CONTENT_REASON.NAVIGATE_AND_RESTORE
-    ) {
+    if (aTab.selected && !window.isBlankPageURL(uri)) {
       browser.focus();
     }
   },