From f13cebc66d347777ec5991df443ceaafdda305c1 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Wed, 19 Aug 2020 15:39:46 -0700
Subject: [PATCH] browser(firefox): remove redundant checks for
 PageTarget._browserContext (#3541)

---
 browser_patches/firefox/BUILD_NUMBER               |  4 ++--
 browser_patches/firefox/juggler/NetworkObserver.js | 13 +++++--------
 browser_patches/firefox/juggler/TargetRegistry.js  | 13 ++++++-------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER
index cfa6c71982..01f579d081 100644
--- a/browser_patches/firefox/BUILD_NUMBER
+++ b/browser_patches/firefox/BUILD_NUMBER
@@ -1,2 +1,2 @@
-1162
-Changed: yurys@chromium.org Wed Aug 19 12:50:44 PDT 2020
+1163
+Changed: yurys@chromium.org Wed Aug 19 15:35:02 PDT 2020
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
index 8a7088a9bb..551fcae75b 100644
--- a/browser_patches/firefox/juggler/NetworkObserver.js
+++ b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -149,9 +149,7 @@ class NetworkRequest {
 
     const pageNetwork = this._activePageNetwork();
     if (pageNetwork) {
-      const browserContext = pageNetwork._target.browserContext();
-      if (browserContext)
-        appendExtraHTTPHeaders(httpChannel, browserContext.extraHTTPHeaders);
+      appendExtraHTTPHeaders(httpChannel, pageNetwork._target.browserContext().extraHTTPHeaders);
       appendExtraHTTPHeaders(httpChannel, pageNetwork._extraHTTPHeaders);
     }
 
@@ -296,13 +294,12 @@ class NetworkRequest {
     const pageNetwork = this._activePageNetwork();
     if (!pageNetwork)
       return false;
-    const browserContext = pageNetwork._target.browserContext();
     let credentials = null;
     if (authInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY) {
       const proxy = this._networkObserver._targetRegistry.getProxyInfo(aChannel);
       credentials = proxy ? {username: proxy.username, password: proxy.password} : null;
     } else {
-      credentials = browserContext ? browserContext.httpCredentials : undefined;
+      credentials = pageNetwork._target.browserContext().httpCredentials;
     }
     if (!credentials)
       return false;
@@ -369,7 +366,7 @@ class NetworkRequest {
     }
 
     const browserContext = pageNetwork._target.browserContext();
-    if (browserContext && browserContext.settings.onlineOverride === 'offline') {
+    if (browserContext.settings.onlineOverride === 'offline') {
       // Implement offline.
       this.abort(Cr.NS_ERROR_OFFLINE);
       return;
@@ -447,9 +444,9 @@ class NetworkRequest {
     if (pageNetwork._requestInterceptionEnabled)
       return true;
     const browserContext = pageNetwork._target.browserContext();
-    if (browserContext && browserContext.requestInterceptionEnabled)
+    if (browserContext.requestInterceptionEnabled)
       return true;
-    if (browserContext && browserContext.settings.onlineOverride === 'offline')
+    if (browserContext.settings.onlineOverride === 'offline')
       return true;
     return false;
   }
diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
index 63f3368b51..cd47cabe7e 100644
--- a/browser_patches/firefox/juggler/TargetRegistry.js
+++ b/browser_patches/firefox/juggler/TargetRegistry.js
@@ -175,6 +175,8 @@ class TargetRegistry {
           openerTarget = this._browserToTarget.get(tab.openerTab.linkedBrowser);
         }
         const browserContext = this._userContextIdToBrowserContext.get(userContextId);
+        if (!browserContext)
+          throw new Error(`Internal error: cannot find context for userContextId=${userContextId}`);
         const target = new PageTarget(this, window, gBrowser, tab, linkedBrowser, browserContext, openerTarget);
 
         const sessions = [];
@@ -374,10 +376,8 @@ class PageTarget {
     ];
 
     this._disposed = false;
-    if (browserContext) {
-      browserContext.pages.add(this);
-      browserContext._firstPageCallback();
-    }
+    browserContext.pages.add(this);
+    browserContext._firstPageCallback();
     this._registry._browserToTarget.set(this._linkedBrowser, this);
     this._registry._browserBrowsingContextToTarget.set(this._linkedBrowser.browsingContext, this);
   }
@@ -434,7 +434,7 @@ class PageTarget {
     return {
       targetId: this.id(),
       type: 'page',
-      browserContextId: this._browserContext ? this._browserContext.browserContextId : undefined,
+      browserContextId: this._browserContext.browserContextId,
       openerId: this._openerId,
     };
   }
@@ -466,8 +466,7 @@ class PageTarget {
 
   dispose() {
     this._disposed = true;
-    if (this._browserContext)
-      this._browserContext.pages.delete(this);
+    this._browserContext.pages.delete(this);
     this._registry._browserToTarget.delete(this._linkedBrowser);
     this._registry._browserBrowsingContextToTarget.delete(this._linkedBrowser.browsingContext);
     helper.removeListeners(this._eventListeners);