Backed out 2 changesets (bug 1550877, bug 1552328) for causing perma geckoview-junit failures on contentPortDisconnectFromApp

Backed out changeset 877ae9359a27 (bug 1550877)
Backed out changeset aee7bbc03bff (bug 1552328)

mobile/android/geckoview/src/androidTest/assets/web_extensions/extension-page-update/background-script.js

@@ -1,7 +0,0 @@
-browser.runtime.onMessage.addListener(notify);
-
-function notify(message) {
-  if (message.action == "showTab") {
-    browser.tabs.update({url: "/tab.html"});
-  }
-}

mobile/android/geckoview/src/androidTest/assets/web_extensions/extension-page-update/manifest.json

@@ -1,24 +0,0 @@
-{
-  "manifest_version": 2,
-  "name": "Mozilla Android Components - Tabs Update Test",
-  "version": "1.0",
-  "background": {
-    "scripts": ["background-script.js"]
-  },
-  "content_scripts": [
-    {
-      "matches": ["*://*.example.com/*"],
-      "js": ["tabs.js"],
-      "run_at": "document_idle"
-    }
-  ],
-  "web_accessible_resources": [
-    "tab.html"
-  ],
-  "permissions": [
-    "geckoViewAddons",
-    "nativeMessaging",
-    "tabs",
-    "<all_urls>"
-  ]
-}

mobile/android/geckoview/src/androidTest/assets/web_extensions/extension-page-update/tab.html

@@ -1 +0,0 @@
-<h1>Hello World!</h1>

mobile/android/geckoview/src/androidTest/assets/web_extensions/extension-page-update/tabs.js

@@ -1 +0,0 @@
-browser.runtime.sendMessage({"action": "showTab"});

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt

@@ -9,7 +9,6 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.ReuseSession
 
 import android.support.test.filters.MediumTest
 import android.support.test.runner.AndroidJUnit4
-import org.hamcrest.core.StringEndsWith.endsWith
 import org.hamcrest.core.IsEqual.equalTo
 import org.json.JSONObject
 import org.junit.Assert
@@ -18,9 +17,7 @@ import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.geckoview.*
-import org.mozilla.geckoview.test.rule.GeckoSessionTestRule
 import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDevToolsAPI
-import org.mozilla.geckoview.test.util.Callbacks
 import org.mozilla.geckoview.test.util.HttpBin
 import java.net.URI
 
@@ -463,49 +460,6 @@ class WebExtensionTest : BaseSessionTest() {
         }
     }
 
-    @Test
-    fun loadWebExtensionPage() {
-        val extension = WebExtension("resource://android/assets/web_extensions/extension-page-update/")
-        sessionRule.waitForResult(sessionRule.runtime.registerWebExtension(extension))
-
-        mainSession.loadUri("http://example.com");
-
-        mainSession.waitUntilCalled(object : Callbacks.NavigationDelegate, Callbacks.ProgressDelegate {
-            @GeckoSessionTestRule.AssertCalled(count = 1)
-            override fun onLocationChange(session: GeckoSession, url: String?) {
-                assertThat("Url should load example.com first",
-                        url, equalTo("http://example.com/"))
-            }
-
-            @GeckoSessionTestRule.AssertCalled(count = 1)
-            override fun onPageStop(session: GeckoSession, success: Boolean) {
-                assertThat("Page should load successfully.",
-                        success, equalTo(true))
-            }
-        })
-
-
-        var page: String? = null
-        var pageStop = GeckoResult<Boolean>()
-
-        mainSession.delegateUntilTestEnd(object : Callbacks.NavigationDelegate, Callbacks.ProgressDelegate {
-            override fun onLocationChange(session: GeckoSession, url: String?) {
-                page = url
-            }
-
-            override fun onPageStop(session: GeckoSession, success: Boolean) {
-                if (success && page != null && page!!.endsWith("/tab.html")) {
-                    pageStop.complete(true)
-                }
-            }
-        })
-
-        // Make sure the page loaded successfully
-        sessionRule.waitForResult(pageStop)
-
-        assertThat("Url should load WebExtension page", page, endsWith("/tab.html"))
-    }
-
     @Test
     fun badFileType() {
         testRegisterError("resource://android/bad/location/error",

mobile/android/modules/geckoview/GeckoViewNavigation.jsm

@@ -10,7 +10,7 @@ const {GeckoViewModule} = ChromeUtils.import("resource://gre/modules/GeckoViewMo
 const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
+  E10SUtils: "resource://gre/modules/sessionstore/Utils.jsm",
   LoadURIDelegate: "resource://gre/modules/LoadURIDelegate.jsm",
   Services: "resource://gre/modules/Services.jsm",
 });

mobile/android/modules/geckoview/GeckoViewProgress.jsm

@@ -169,7 +169,6 @@ class GeckoViewProgress extends GeckoViewModule {
     }
 
     Services.obs.removeObserver(this, "oop-frameloader-crashed");
-    this.unregisterListener("GeckoView:FlushSessionState");
   }
 
   onEvent(aEvent, aData, aCallback) {