Revert "Issue #2301 - Make Gecko Media Plugins optional when not building EME or WebRTC"

This reverts commit 9e7d1492e6.

dom/media/webaudio/BufferDecoder.cpp

@@ -7,23 +7,15 @@
 
 #include "nsISupports.h"
 #include "MediaResource.h"
-#ifdef MOZ_GMP
 #include "GMPService.h"
-#endif
 
 namespace mozilla {
 
 NS_IMPL_ISUPPORTS0(BufferDecoder)
 
-#ifdef MOZ_GMP
 BufferDecoder::BufferDecoder(MediaResource* aResource, GMPCrashHelper* aCrashHelper)
-#else
-BufferDecoder::BufferDecoder(MediaResource* aResource)
-#endif
   : mResource(aResource)
-#ifdef MOZ_GMP
   , mCrashHelper(aCrashHelper)
-#endif
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_COUNT_CTOR(BufferDecoder);
@@ -75,12 +67,10 @@ BufferDecoder::GetOwner() const
   return nullptr;
 }
 
-#ifdef MOZ_GMP
 already_AddRefed<GMPCrashHelper>
 BufferDecoder::GetCrashHelper()
 {
   return do_AddRef(mCrashHelper);
 }
-#endif
 
 } // namespace mozilla

dom/media/webaudio/BufferDecoder.h

@@ -23,11 +23,7 @@ class BufferDecoder final : public AbstractMediaDecoder
 public:
   // This class holds a weak pointer to MediaResource.  It's the responsibility
   // of the caller to manage the memory of the MediaResource object.
-#ifdef MOZ_GMP
   explicit BufferDecoder(MediaResource* aResource, GMPCrashHelper* aCrashHelper);
-#else
-  explicit BufferDecoder(MediaResource* aResource);
-#endif
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -43,17 +39,13 @@ public:
 
   MediaDecoderOwner* GetOwner() const final override;
 
-#ifdef MOZ_GMP
   already_AddRefed<GMPCrashHelper> GetCrashHelper() override;
-#endif
 
 private:
   virtual ~BufferDecoder();
   RefPtr<TaskQueue> mTaskQueueIdentity;
   RefPtr<MediaResource> mResource;
-#ifdef MOZ_GMP
   RefPtr<GMPCrashHelper> mCrashHelper;
-#endif
 };
 
 } // namespace mozilla

dom/media/webaudio/MediaBufferDecoder.cpp

@@ -24,9 +24,7 @@
 #include "WebAudioUtils.h"
 #include "mozilla/dom/Promise.h"
 #include "nsPrintfCString.h"
-#ifdef MOZ_GMP
 #include "GMPService.h"
-#endif
 
 namespace mozilla {
 
@@ -182,7 +180,6 @@ MediaDecodeTask::Run()
   return NS_OK;
 }
 
-#ifdef MOZ_GMP
 class BufferDecoderGMPCrashHelper : public GMPCrashHelper
 {
 public:
@@ -200,7 +197,6 @@ public:
 private:
   nsWeakPtr mParent;
 };
-#endif
 
 bool
 MediaDecodeTask::CreateReader()
@@ -219,12 +215,8 @@ MediaDecodeTask::CreateReader()
                             mLength, principal, mContentType);
 
   MOZ_ASSERT(!mBufferDecoder);
-#ifdef MOZ_GMP
   mBufferDecoder = new BufferDecoder(resource,
     new BufferDecoderGMPCrashHelper(mDecodeJob.mContext->GetParentObject()));
-#else
-    mBufferDecoder = new BufferDecoder(resource);
-#endif
 
   // If you change this list to add support for new decoders, please consider
   // updating HTMLMediaElement::CreateDecoder as well.