From aff542f7f13610460360757049e5d6e76d24584b Mon Sep 17 00:00:00 2001
From: Agi Sferro <agi@sferro.dev>
Date: Tue, 14 Apr 2020 15:25:48 +0000
Subject: [PATCH] Bug 1628117 - Remove BrowserApp.tabs. r=lina,snorp

Differential Revision: https://phabricator.services.mozilla.com/D70454

--HG--
extra : moz-landing-system : lando
---
 dom/push/PushRecord.jsm                           | 9 ++-------
 mobile/android/modules/geckoview/GeckoViewTab.jsm | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dom/push/PushRecord.jsm b/dom/push/PushRecord.jsm
index a04caa850e23..0793635e1519 100644
--- a/dom/push/PushRecord.jsm
+++ b/dom/push/PushRecord.jsm
@@ -199,13 +199,8 @@ PushRecord.prototype = {
       if (window.closed || PrivateBrowsingUtils.isWindowPrivate(window)) {
         continue;
       }
-      // `gBrowser` on Desktop; `BrowserApp` on Fennec.
-      let tabs = window.gBrowser
-        ? window.gBrowser.tabs
-        : window.BrowserApp.tabs;
-      for (let tab of tabs) {
-        // `linkedBrowser` on Desktop; `browser` on Fennec.
-        let tabURI = (tab.linkedBrowser || tab.browser).currentURI;
+      for (let tab of window.gBrowser.tabs) {
+        let tabURI = tab.linkedBrowser.currentURI;
         if (tabURI.prePath == this.uri.prePath) {
           return true;
         }
diff --git a/mobile/android/modules/geckoview/GeckoViewTab.jsm b/mobile/android/modules/geckoview/GeckoViewTab.jsm
index 10e82e557d24..9ab4cff92592 100644
--- a/mobile/android/modules/geckoview/GeckoViewTab.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewTab.jsm
@@ -44,7 +44,6 @@ class BrowserAppShim {
     );
     this.selectedBrowser = window.browser;
     this.selectedTab = new Tab(tabId, this.selectedBrowser);
-    this.tabs = [this.selectedTab];
   }
 
   getTabForBrowser(aBrowser) {