Revert following changes for fixing Primetime issue:

- Issue #26 Part 2a: make more EME code conditional. (99118e38e)
- Issue #26 - Part 2b: Stub out GMPDecryptorProxy functions. (d44c61bf6)
- Issue #26 - Part 2c: Remove dependence on gmp/widevine-adapter/* (4c9689f68)
- Issue #1392 - Change --enable-eme to MOZ_ARG_ENABLE_BOOL and remove MOZ_EME_MODULES (832d84d2c)
- [Basilisk] Issue MoonchildProductions/UXP#1392 - Remove usage of MOZ_EME_MODULES (3a165cd)
- Issue #65 - Remove AppConstants from toolkit/mozapps/extensions (758618b60)

dom/media/gmp/GMPChild.cpp

@@ -22,9 +22,7 @@
 #include "GMPUtils.h"
 #include "prio.h"
 #include "base/task.h"
-#ifdef MOZ_EME
 #include "widevine-adapter/WidevineAdapter.h"
-#endif
 
 using namespace mozilla::ipc;
 
@@ -256,13 +254,9 @@ GMPChild::AnswerStartPlugin(const nsString& aAdapter)
     return false;
   }
 
-#ifdef MOZ_EME
   bool isWidevine = aAdapter.EqualsLiteral("widevine");
 
   GMPAdapter* adapter = (isWidevine) ? new WidevineAdapter() : nullptr;
-#else
-  GMPAdapter* adapter = nullptr;
-#endif
   if (!mGMPLoader->Load(libPath.get(),
                         libPath.Length(),
                         mNodeId.BeginWriting(),

dom/media/gmp/GMPDecryptorParent.cpp

@@ -43,13 +43,11 @@ GMPDecryptorParent::~GMPDecryptorParent()
 bool
 GMPDecryptorParent::RecvSetDecryptorId(const uint32_t& aId)
 {
-#ifdef MOZ_EME
   if (!mIsOpen) {
     NS_WARNING("Trying to use a dead GMP decrypter!");
     return false;
   }
   mCallback->SetDecryptorId(aId);
-#endif
   return true;
 }
 
@@ -204,7 +202,6 @@ bool
 GMPDecryptorParent::RecvSetSessionId(const uint32_t& aCreateSessionId,
                                      const nsCString& aSessionId)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvSetSessionId(token=%u, sessionId='%s')",
         this, aCreateSessionId, aSessionId.get()));
 
@@ -213,7 +210,6 @@ GMPDecryptorParent::RecvSetSessionId(const uint32_t& aCreateSessionId,
     return false;
   }
   mCallback->SetSessionId(aCreateSessionId, aSessionId);
-#endif
   return true;
 }
 
@@ -221,7 +217,6 @@ bool
 GMPDecryptorParent::RecvResolveLoadSessionPromise(const uint32_t& aPromiseId,
                                                   const bool& aSuccess)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvResolveLoadSessionPromise(promiseId=%u)",
         this, aPromiseId));
 
@@ -230,14 +225,12 @@ GMPDecryptorParent::RecvResolveLoadSessionPromise(const uint32_t& aPromiseId,
     return false;
   }
   mCallback->ResolveLoadSessionPromise(aPromiseId, aSuccess);
-#endif
   return true;
 }
 
 bool
 GMPDecryptorParent::RecvResolvePromise(const uint32_t& aPromiseId)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvResolvePromise(promiseId=%u)",
         this, aPromiseId));
 
@@ -246,7 +239,6 @@ GMPDecryptorParent::RecvResolvePromise(const uint32_t& aPromiseId)
     return false;
   }
   mCallback->ResolvePromise(aPromiseId);
-#endif
   return true;
 }
 
@@ -274,7 +266,6 @@ GMPDecryptorParent::RecvRejectPromise(const uint32_t& aPromiseId,
                                       const GMPDOMException& aException,
                                       const nsCString& aMessage)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvRejectPromise(promiseId=%u, exception=%d, msg='%s')",
         this, aPromiseId, aException, aMessage.get()));
 
@@ -283,11 +274,10 @@ GMPDecryptorParent::RecvRejectPromise(const uint32_t& aPromiseId,
     return false;
   }
   mCallback->RejectPromise(aPromiseId, GMPExToNsresult(aException), aMessage);
-#endif
   return true;
 }
 
-#ifdef MOZ_EME
+
 static dom::MediaKeyMessageType
 ToMediaKeyMessageType(GMPSessionMessageType aMessageType) {
   switch (aMessageType) {
@@ -298,14 +288,12 @@ ToMediaKeyMessageType(GMPSessionMessageType aMessageType) {
     default: return dom::MediaKeyMessageType::License_request;
   };
 };
-#endif
 
 bool
 GMPDecryptorParent::RecvSessionMessage(const nsCString& aSessionId,
                                        const GMPSessionMessageType& aMessageType,
                                        nsTArray<uint8_t>&& aMessage)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvSessionMessage(sessionId='%s', type=%d, msg='%s')",
         this, aSessionId.get(), aMessageType, ToBase64(aMessage).get()));
 
@@ -314,7 +302,6 @@ GMPDecryptorParent::RecvSessionMessage(const nsCString& aSessionId,
     return false;
   }
   mCallback->SessionMessage(aSessionId, ToMediaKeyMessageType(aMessageType), aMessage);
-#endif
   return true;
 }
 
@@ -322,7 +309,6 @@ bool
 GMPDecryptorParent::RecvExpirationChange(const nsCString& aSessionId,
                                          const double& aExpiryTime)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvExpirationChange(sessionId='%s', expiry=%lf)",
         this, aSessionId.get(), aExpiryTime));
 
@@ -331,14 +317,12 @@ GMPDecryptorParent::RecvExpirationChange(const nsCString& aSessionId,
     return false;
   }
   mCallback->ExpirationChange(aSessionId, aExpiryTime);
-#endif
   return true;
 }
 
 bool
 GMPDecryptorParent::RecvSessionClosed(const nsCString& aSessionId)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvSessionClosed(sessionId='%s')",
         this, aSessionId.get()));
 
@@ -347,7 +331,6 @@ GMPDecryptorParent::RecvSessionClosed(const nsCString& aSessionId)
     return false;
   }
   mCallback->SessionClosed(aSessionId);
-#endif
   return true;
 }
 
@@ -357,7 +340,6 @@ GMPDecryptorParent::RecvSessionError(const nsCString& aSessionId,
                                      const uint32_t& aSystemCode,
                                      const nsCString& aMessage)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvSessionError(sessionId='%s', exception=%d, sysCode=%d, msg='%s')",
         this, aSessionId.get(),
         aException, aSystemCode, aMessage.get()));
@@ -370,11 +352,9 @@ GMPDecryptorParent::RecvSessionError(const nsCString& aSessionId,
                           GMPExToNsresult(aException),
                           aSystemCode,
                           aMessage);
-#endif
   return true;
 }
 
-#ifdef MOZ_EME
 static dom::MediaKeyStatus
 ToMediaKeyStatus(GMPMediaKeyStatus aStatus) {
   switch (aStatus) {
@@ -388,13 +368,11 @@ ToMediaKeyStatus(GMPMediaKeyStatus aStatus) {
     default: return dom::MediaKeyStatus::Internal_error;
   }
 }
-#endif
 
 bool
 GMPDecryptorParent::RecvBatchedKeyStatusChanged(const nsCString& aSessionId,
                                                 InfallibleTArray<GMPKeyInformation>&& aKeyInfos)
 {
-#ifdef MOZ_EME
   LOGD(("GMPDecryptorParent[%p]::RecvBatchedKeyStatusChanged(sessionId='%s', KeyInfos len='%d')",
         this, aSessionId.get(), aKeyInfos.Length()));
 
@@ -414,11 +392,9 @@ GMPDecryptorParent::RecvBatchedKeyStatusChanged(const nsCString& aSessionId,
     }
     mCallback->BatchedKeyStatusChanged(aSessionId, cdmKeyInfos);
   }
-#endif
   return true;
 }
 
-#ifdef MOZ_EME
 DecryptStatus
 ToDecryptStatus(GMPErr aError)
 {
@@ -429,14 +405,12 @@ ToDecryptStatus(GMPErr aError)
     default: return GenericErr;
   }
 }
-#endif
 
 bool
 GMPDecryptorParent::RecvDecrypted(const uint32_t& aId,
                                   const GMPErr& aErr,
                                   InfallibleTArray<uint8_t>&& aBuffer)
 {
-#ifdef MOZ_EME
   LOGV(("GMPDecryptorParent[%p]::RecvDecrypted(id=%d, err=%d)",
         this, aId, aErr));
 
@@ -445,7 +419,6 @@ GMPDecryptorParent::RecvDecrypted(const uint32_t& aId,
     return false;
   }
   mCallback->Decrypted(aId, ToDecryptStatus(aErr), aBuffer);
-#endif
   return true;
 }
 

dom/media/gmp/GMPDecryptorProxy.h

@@ -6,9 +6,7 @@
 #ifndef GMPDecryptorProxy_h_
 #define GMPDecryptorProxy_h_
 
-#ifdef MOZ_EME
 #include "mozilla/DecryptorProxyCallback.h"
-#endif
 #include "GMPCallbackBase.h"
 #include "gmp-decryption.h"
 #include "nsString.h"
@@ -17,13 +15,8 @@ namespace mozilla {
 class CryptoSample;
 } // namespace mozilla
 
-#ifdef MOZ_EME
 class GMPDecryptorProxyCallback : public DecryptorProxyCallback,
                                   public GMPCallbackBase {
-#else
-class GMPDecryptorProxyCallback : public GMPCallbackBase {
-#endif
-
 public:
   virtual ~GMPDecryptorProxyCallback() {}
 };

dom/media/gmp/GMPParent.cpp

@@ -30,10 +30,8 @@ using mozilla::ipc::GeckoChildProcessHost;
 #include "WMFDecoderModule.h"
 #endif
 
-#ifdef MOZ_EME
 #include "mozilla/dom/WidevineCDMManifestBinding.h"
 #include "widevine-adapter/WidevineAdapter.h"
-#endif
 
 namespace mozilla {
 
@@ -656,7 +654,6 @@ GMPParent::ReadGMPMetaData()
     return ReadGMPInfoFile(infoFile);
   }
 
-#ifdef MOZ_EME
   // Maybe this is the Widevine adapted plugin?
   nsCOMPtr<nsIFile> manifestFile;
   rv = mDirectory->Clone(getter_AddRefs(manifestFile));
@@ -665,9 +662,6 @@ GMPParent::ReadGMPMetaData()
   }
   manifestFile->AppendRelativePath(NS_LITERAL_STRING("manifest.json"));
   return ReadChromiumManifestFile(manifestFile);
-#else
-  return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
-#endif
 }
 
 RefPtr<GenericPromise>
@@ -770,7 +764,6 @@ GMPParent::ReadChromiumManifestFile(nsIFile* aFile)
 RefPtr<GenericPromise>
 GMPParent::ParseChromiumManifest(nsString aJSON)
 {
-#ifdef MOZ_EME
   LOGD("%s: for '%s'", __FUNCTION__, NS_LossyConvertUTF16toASCII(aJSON).get());
 
   MOZ_ASSERT(NS_IsMainThread());
@@ -808,10 +801,6 @@ GMPParent::ParseChromiumManifest(nsString aJSON)
 #endif
 
   return GenericPromise::CreateAndResolve(true, __func__);
-#else  // !MOZ_EME
-  MOZ_ASSERT_UNREACHABLE("don't call me if EME isn't enabled");
-  return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
-#endif // !MOZ_EME
 }
 
 bool

dom/media/gmp/moz.build

@@ -35,6 +35,8 @@ EXPORTS += [
     'GMPAudioDecoderProxy.h',
     'GMPAudioHost.h',
     'GMPCallbackBase.h',
+    'GMPCDMCallbackProxy.h',
+    'GMPCDMProxy.h',
     'GMPChild.h',
     'GMPContentChild.h',
     'GMPContentParent.h',
@@ -71,12 +73,6 @@ EXPORTS += [
     'GMPVideoPlaneImpl.h',
 ]
 
-if CONFIG['MOZ_EME']:
-    EXPORTS += [
-        'GMPCDMCallbackProxy.h',
-        'GMPCDMProxy.h',
-    ]
-
 # We link GMPLoader into xul on B2G/Fennec as its code does not need to be
 # covered by a DRM vendor's voucher.
 if CONFIG['OS_TARGET'] == 'Android':
@@ -91,6 +87,8 @@ UNIFIED_SOURCES += [
     'GMPAudioDecoderChild.cpp',
     'GMPAudioDecoderParent.cpp',
     'GMPAudioHost.cpp',
+    'GMPCDMCallbackProxy.cpp',
+    'GMPCDMProxy.cpp',
     'GMPChild.cpp',
     'GMPContentChild.cpp',
     'GMPContentParent.cpp',
@@ -122,16 +120,10 @@ UNIFIED_SOURCES += [
     'GMPVideoPlaneImpl.cpp',
 ]
 
-if CONFIG['MOZ_EME']:
-    UNIFIED_SOURCES += [
-        'GMPCDMCallbackProxy.cpp',
-        'GMPCDMProxy.cpp',
-    ]
-
-DIRS += ['rlz']
-
-if CONFIG['MOZ_EME']:
-    DIRS += ['widevine-adapter']
+DIRS += [
+    'rlz',
+    'widevine-adapter',
+]
 
 IPDL_SOURCES += [
   'GMPTypes.ipdlh',