Backed out 2 changesets (bug 1834172, bug 1827747) for breaking local artifacts . a=backout

Backed out changeset 0ceb457743b4 (bug 1834172)
Backed out changeset 7ad6a3ad9db7 (bug 1827747)

browser/installer/Makefile.in

@@ -67,7 +67,6 @@ DEFINES += -DMOZ_ENABLE_SKIA_PDF=$(MOZ_ENABLE_SKIA_PDF)
 endif
 
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
-DEFINES += -DMOZ_EME_PROCESS_NAME="$(MOZ_EME_PROCESS_NAME)"
 
 # Set MSVC dlls version to package, if any.
 ifdef MOZ_NO_DEBUG_RTL

browser/installer/allowed-dupes.mn

@@ -11,7 +11,6 @@ updater.app/Contents/MacOS/org.mozilla.updater
 
 plugin-container.app/Contents/PkgInfo
 updater.app/Contents/PkgInfo
-media-plugin-helper.app/Contents/PkgInfo
 
 # Duplicated on Linux by browser/branding/branding-common.mozbuild
 #ifdef XP_LINUX

browser/installer/package-manifest.in

@@ -90,7 +90,6 @@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@BINPATH@/@MOZ_EME_PROCESS_NAME@.app/
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif

ipc/app/Makefile.in

@@ -30,7 +30,7 @@ libs::
 	$(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app
 	rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app 
 	$(call py_action,preprocessor,-Fsubstitution -DPROGRAM='$(MOZ_CHILD_PROCESS_NAME)' -DMOZ_DEVELOPER_REPO_PATH='$(topsrcdir)' -DMOZ_DEVELOPER_OBJ_PATH='$(topobjdir)' $(srcdir)/macbuild/Contents/Info.plist.in -o $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/Info.plist)
-	$(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_CHILD_PROCESS_APPNAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings)
+	$(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_CHILD_PROCESS_BUNDLENAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings)
 	$(NSINSTALL) -D $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS
 	$(NSINSTALL) $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME) $(DIST)/bin/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS
 endif #}

ipc/glue/GeckoChildProcessHost.cpp

@@ -19,7 +19,6 @@
 #  include "SharedMemoryBasic.h"
 #  include "base/rand_util.h"
 #  include "chrome/common/mach_ipc_mac.h"
-#  include "mozilla/StaticPrefs_media.h"
 #  include "nsILocalFileMac.h"
 #endif
 
@@ -565,22 +564,6 @@ mozilla::BinPathType BaseProcessLauncher::GetPathToBinary(
     return pathType;
   }
 
-#ifdef MOZ_WIDGET_COCOA
-  // The GMP child process runs via the Media Plugin Helper executable
-  // which is a clone of plugin-container allowing for GMP-specific
-  // codesigning entitlements.
-  nsCString bundleName;
-  std::string executableLeafName;
-  if (processType == GeckoProcessType_GMPlugin &&
-      mozilla::StaticPrefs::media_plugin_helper_process_enabled()) {
-    bundleName = MOZ_EME_PROCESS_BUNDLENAME;
-    executableLeafName = MOZ_EME_PROCESS_NAME_BRANDED;
-  } else {
-    bundleName = MOZ_CHILD_PROCESS_BUNDLENAME;
-    executableLeafName = MOZ_CHILD_PROCESS_NAME;
-  }
-#endif
-
   if (ShouldHaveDirectoryService()) {
     MOZ_ASSERT(gGREBinPath);
 #ifdef OS_WIN
@@ -592,7 +575,7 @@ mozilla::BinPathType BaseProcessLauncher::GetPathToBinary(
 
     // We need to use an App Bundle on OS X so that we can hide
     // the dock icon. See Bug 557225.
-    childProcPath->AppendNative(bundleName);
+    childProcPath->AppendNative("plugin-container.app"_ns);
     childProcPath->AppendNative("Contents"_ns);
     childProcPath->AppendNative("MacOS"_ns);
     nsCString tempCPath;
@@ -615,11 +598,7 @@ mozilla::BinPathType BaseProcessLauncher::GetPathToBinary(
     exePath = exePath.DirName();
   }
 
-#ifdef MOZ_WIDGET_COCOA
-  exePath = exePath.Append(executableLeafName);
-#else
   exePath = exePath.AppendASCII(MOZ_CHILD_PROCESS_NAME);
-#endif
 
   return pathType;
 }

ipc/glue/moz.build

@@ -279,12 +279,7 @@ FINAL_LIBRARY = "xul"
 if CONFIG["OS_ARCH"] == "Darwin":
     OS_LIBS += ["bsm"]  # for audit_token_to_pid
 
-for var in (
+for var in ("MOZ_CHILD_PROCESS_NAME", "MOZ_CHILD_PROCESS_BUNDLE"):
-    "MOZ_CHILD_PROCESS_NAME",
-    "MOZ_CHILD_PROCESS_BUNDLENAME",
-    "MOZ_EME_PROCESS_NAME_BRANDED",
-    "MOZ_EME_PROCESS_BUNDLENAME",
-):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "WINNT":

ipc/mediapluginhelper/Makefile.in

@@ -1,18 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{
-
-libs::
-	$(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app
-	rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app 
-	$(call py_action,preprocessor,-Fsubstitution -DPROGRAM='$(MOZ_EME_PROCESS_NAME)' -DMOZ_EME_PROCESS_BUNDLEID='$(MOZ_EME_PROCESS_BUNDLEID)' -DMOZ_EME_PROCESS_NAME_BRANDED='$(MOZ_EME_PROCESS_NAME_BRANDED)' -DMOZ_DEVELOPER_REPO_PATH='$(topsrcdir)' -DMOZ_DEVELOPER_OBJ_PATH='$(topobjdir)' $(srcdir)/macbuild/Contents/Info.plist.in -o $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/Info.plist)
-	$(call py_action,preprocessor,-Fsubstitution --output-encoding utf-16 -DAPP_NAME='$(MOZ_EME_PROCESS_BUNDLENAME)' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in -o $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/Resources/English.lproj/InfoPlist.strings)
-	$(NSINSTALL) -D $(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/MacOS
-	cp $(DIST)/bin/$(MOZ_EME_PROCESS_NAME) "$(DIST)/bin/$(MOZ_EME_PROCESS_NAME).app/Contents/MacOS/$(MOZ_EME_PROCESS_NAME_BRANDED)"
-endif #}

ipc/mediapluginhelper/macbuild/Contents/Info.plist.in

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>@MOZ_EME_PROCESS_NAME_BRANDED@</string>
-	<key>CFBundleIdentifier</key>
-	<string>@MOZ_EME_PROCESS_BUNDLEID@</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSBackgroundOnly</key>
-	<string>1</string>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<true/>
-	<key>NSSupportsAutomaticGraphicsSwitching</key>
-	<true/>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-        <key>MozillaDeveloperRepoPath</key>
-        <string>@MOZ_DEVELOPER_REPO_PATH@</string>
-        <key>MozillaDeveloperObjPath</key>
-        <string>@MOZ_DEVELOPER_OBJ_PATH@</string>
-</dict>
-</plist>

ipc/mediapluginhelper/macbuild/Contents/PkgInfo

@@ -1 +0,0 @@
-APPL????

ipc/mediapluginhelper/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in

@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "@APP_NAME@";

ipc/mediapluginhelper/moz.build

@@ -1,20 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG["OS_TARGET"] == "Darwin":
-    GeckoProgram(CONFIG["MOZ_EME_PROCESS_NAME"], linkage="dependent")
-    SOURCES += [
-        "../app/MozillaRuntimeMain.cpp",
-    ]
-
-    include("/ipc/chromium/chromium-config.mozbuild")
-
-    LDFLAGS += ["-Wl,-rpath,@executable_path/../../../"]
-
-    CXXFLAGS += ["-Wshadow"]
-
-    with Files("**"):
-        BUG_COMPONENT = ("Core", "Audio/Video: GMP")

ipc/moz.build

@@ -6,7 +6,6 @@
 
 DIRS += [
     "app",
-    "mediapluginhelper",
     "chromium",
     "glue",
     "ipdl",

modules/libpref/init/StaticPrefList.yaml

@@ -11016,15 +11016,6 @@
   value: true
   mirror: always
 
-# On Mac, enables using the `<Brand> Media Plugin Helper` executable as the
-# GMP child process instead of the plugin-container executable.
-#if defined(XP_MACOSX)
--   name: media.plugin_helper_process.enabled
-    type: RelaxedAtomicBool
-    value: false
-    mirror: always
-#endif
-
 #---------------------------------------------------------------------------
 # Prefs starting with "midi."
 #---------------------------------------------------------------------------

old-configure.in

@@ -1176,32 +1176,12 @@ else
   MOZ_CHILD_PROCESS_NAME="libplugin-container.so"
 fi
 MOZ_CHILD_PROCESS_BUNDLE="plugin-container.app/Contents/MacOS/"
-MOZ_CHILD_PROCESS_BUNDLENAME="plugin-container.app"
+MOZ_CHILD_PROCESS_BUNDLENAME="${MOZ_APP_DISPLAYNAME}CP"
-MOZ_CHILD_PROCESS_APPNAME="${MOZ_APP_DISPLAYNAME}CP"
 
 AC_SUBST(MOZ_CHILD_PROCESS_NAME)
 AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE)
-AC_SUBST(MOZ_CHILD_PROCESS_APPNAME)
 AC_SUBST(MOZ_CHILD_PROCESS_BUNDLENAME)
 
-dnl ==========================================================
-dnl = Mac Media Plugin Helper (GMP Child) Process Name for IPC
-dnl ==========================================================
-MOZ_EME_PROCESS_NAME="media-plugin-helper"
-MOZ_EME_PROCESS_NAME_BRANDED="$MOZ_APP_DISPLAYNAME Media Plugin Helper"
-MOZ_EME_PROCESS_BUNDLENAME="${MOZ_EME_PROCESS_NAME}.app"
-# Generate a lower case string with no spaces to be used as the bundle ID
-# for the EME helper .app of the form org.mozilla.<executable-name>.
-MOZ_EME_PROCESS_BUNDLEID=`echo "$MOZ_APP_DISPLAYNAME" | tr ' ' '-'`
-MOZ_EME_PROCESS_BUNDLEID=`echo "$MOZ_EME_PROCESS_BUNDLEID" | tr 'A-Z' 'a-z'`
-MOZ_EME_PROCESS_BUNDLEID=${MOZ_EME_PROCESS_BUNDLEID}-${MOZ_EME_PROCESS_NAME}
-MOZ_EME_PROCESS_BUNDLEID=${MOZ_DISTRIBUTION_ID}.${MOZ_EME_PROCESS_BUNDLEID}
-
-AC_SUBST(MOZ_EME_PROCESS_NAME)
-AC_SUBST(MOZ_EME_PROCESS_NAME_BRANDED)
-AC_SUBST(MOZ_EME_PROCESS_BUNDLENAME)
-AC_SUBST(MOZ_EME_PROCESS_BUNDLEID)
-
 # The following variables are available to branding and application
 # configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
 # - MOZ_APP_VENDOR: Used for application.ini's "Vendor" field, which also

python/mozbuild/mozbuild/artifacts.py

@@ -646,7 +646,6 @@ class MacArtifactJob(ArtifactJob):
         "Contents/MacOS",
         [
             "crashreporter.app/Contents/MacOS/crashreporter",
-            "media-plugin-helper.app/Contents/MacOS/* Media Plugin Helper",
             "{product}",
             "{product}-bin",
             "*.dylib",