fixup! Base Browser's .mozconfigs.

Bug 42501: Move `--disable-eme` to OS- and architecture-specific
mozconfigs.

browser/config/mozconfigs/base-browser

@@ -29,8 +29,6 @@ ac_add_options --disable-crashreporter
 # Before removing, please notice that WebRTC does not work on mingw (Bug 1393901)
 ac_add_options --disable-webrtc
 ac_add_options --disable-parental-controls
-# Let's make sure no preference is enabling either Adobe's or Google's CDM.
-ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
 # See bugs #30575 and #32418: system policies are harmful either because they
 # could allow proxy bypass, and override a number of other preferences we set

mozconfig-linux-i686

@@ -10,3 +10,7 @@ ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
 ac_add_options --enable-default-toolkit=cairo-gtk3
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-linux-x86_64

@@ -7,3 +7,7 @@ ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
 ac_add_options --enable-default-toolkit=cairo-gtk3
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-linux-x86_64-asan

@@ -20,3 +20,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-linux-x86_64-dev

@@ -16,3 +16,7 @@ ac_add_options --disable-install-strip
 
 ac_add_options --with-base-browser-version=dev-build
 ac_add_options --disable-base-browser-update
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-macos

@@ -10,3 +10,7 @@ ac_add_options --disable-update-agent
 
 # For base-browser we do not enable portable mode on macOS.
 ac_add_options --without-relative-data-dir
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-macos-dev

@@ -17,3 +17,6 @@ ac_add_options --enable-nss-mar
 # See bug #41131
 ac_add_options --disable-update-agent
 
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-windows-i686

@@ -19,3 +19,7 @@ ac_add_options --disable-update-agent
 # Bug 1782837: Not supported because Mozilla (and therefore also us) build
 # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled.
 ac_add_options --disable-notification-server
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+

mozconfig-windows-x86_64

@@ -19,3 +19,7 @@ ac_add_options --disable-update-agent
 # Bug 1782837: Not supported because Mozilla (and therefore also us) build
 # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled.
 ac_add_options --disable-notification-server
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+