From e5989d69619f8700ae30658d6bbebddc88379a71 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 14 May 2020 20:34:28 +0000
Subject: [PATCH] Bug 1634719: Drop the broken extraProps argument to
 newAppInfo. r=mixedpuppy

Differential Revision: https://phabricator.services.mozilla.com/D73469
---
 testing/modules/AppInfo.jsm                            | 7 -------
 toolkit/mozapps/extensions/internal/AddonTestUtils.jsm | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/testing/modules/AppInfo.jsm b/testing/modules/AppInfo.jsm
index 229caf04cbce..9685d8b3d820 100644
--- a/testing/modules/AppInfo.jsm
+++ b/testing/modules/AppInfo.jsm
@@ -29,11 +29,8 @@ let origRuntime = Cc["@mozilla.org/xre/app-info;1"].getService(
  *   lastAppVersion:  nsIXULRuntime.lastAppVersion
  *
  *   crashReporter:   nsICrashReporter interface is implemented if true
- *   extraProps:      extra properties added to XULAppInfo
  */
 var newAppInfo = function(options = {}) {
-  let extraProps = "extraProps" in options ? options.extraProps : {};
-
   let appInfo = {
     // nsIXULAppInfo
     vendor: "Mozilla",
@@ -79,10 +76,6 @@ var newAppInfo = function(options = {}) {
     interfaces.push(Ci.nsICrashReporter);
   }
 
-  for (let key of Object.keys(extraProps)) {
-    appInfo.browserTabsRemoteAutostart = extraProps[key];
-  }
-
   appInfo.QueryInterface = ChromeUtils.generateQI(interfaces);
 
   return appInfo;
diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
index 584df7cf7ff3..624668152ee9 100644
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
@@ -686,9 +686,6 @@ var AddonTestUtils = {
       version,
       platformVersion,
       crashReporter: true,
-      extraProps: {
-        browserTabsRemoteAutostart: false,
-      },
     });
     this.appInfo = AppInfo.getAppInfo();
   },