From b8159e6c763d8b35a0497d435892d4bc69da884c Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 26 Jan 2017 16:10:09 -0800
Subject: [PATCH] Bug 1333608 - Stop naming the testaddon on OSX for the
 benefit of universal builds. r=gfritzsche

We were including toolchain info in the testaddon on OSX so we could separate
xpis for universal builds. With universal builds going away, we can stop doing
this.


MozReview-Commit-ID: 4vqMfKJPGp3

--HG--
extra : rebase_source : 7bd0eee6550adf9af136a21ac22f5b59036e2e34
---
 dom/plugins/test/testaddon/Makefile.in                |  4 +---
 .../test/unit/test_plugin_default_state_xpi.js        | 11 +----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/dom/plugins/test/testaddon/Makefile.in b/dom/plugins/test/testaddon/Makefile.in
index af88ada71aca..80d65d6c0280 100644
--- a/dom/plugins/test/testaddon/Makefile.in
+++ b/dom/plugins/test/testaddon/Makefile.in
@@ -6,15 +6,13 @@ include $(topsrcdir)/config/rules.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 plugin_file_names = Test.plugin SecondTest.plugin ThirdTest.plugin npswftest.plugin
-addon_file_name = testaddon_$(TARGET_XPCOM_ABI).xpi
 else
 plugin_file_names = $(DLL_PREFIX)nptest$(DLL_SUFFIX) $(DLL_PREFIX)npsecondtest$(DLL_SUFFIX) $(DLL_PREFIX)npthirdtest$(DLL_SUFFIX) $(DLL_PREFIX)npswftest$(DLL_SUFFIX)
-addon_file_name = testaddon.xpi
 endif
 
 # This is so hacky. Waiting on bug 988938.
 testdir = $(topobjdir)/_tests/xpcshell/dom/plugins/test/unit/
-addonpath = $(testdir)/$(addon_file_name)
+addonpath = $(testdir)/testaddon.xpi
 
 ifdef COMPILE_ENVIRONMENT
 libs::
diff --git a/dom/plugins/test/unit/test_plugin_default_state_xpi.js b/dom/plugins/test/unit/test_plugin_default_state_xpi.js
index f1aeb3ac9e45..680e2fcd744e 100644
--- a/dom/plugins/test/unit/test_plugin_default_state_xpi.js
+++ b/dom/plugins/test/unit/test_plugin_default_state_xpi.js
@@ -10,7 +10,6 @@ const XRE_EXTENSIONS_DIR_LIST = "XREExtDL";
 const NS_APP_PLUGINS_DIR_LIST = "APluginsDL";
 
 const gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-const gXPCOMABI = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).XPCOMABI;
 var gProfileDir = null;
 
 function getAddonRoot(profileDir, id) {
@@ -21,14 +20,6 @@ function getAddonRoot(profileDir, id) {
   return dir;
 }
 
-function getTestaddonFilename() {
-  let abiPart = "";
-  if (gIsOSX) {
-    abiPart = "_" + gXPCOMABI;
-  }
-  return "testaddon" + abiPart + ".xpi";
-}
-
 function run_test() {
   allow_all_plugins();
   loadAddonManager();
@@ -48,7 +39,7 @@ add_task(function* test_state() {
   Services.prefs.setIntPref("plugin.default.state", Ci.nsIPluginTag.STATE_CLICKTOPLAY);
   Services.prefs.setIntPref("plugin.defaultXpi.state", Ci.nsIPluginTag.STATE_ENABLED);
 
-  let success = yield installAddon(getTestaddonFilename());
+  let success = yield installAddon("testaddon.xpi");
   Assert.ok(success, "Should have installed addon.");
   let addonDir = getAddonRoot(gProfileDir, ADDON_ID);