Bug 1394651 - remove MediaResource from the base class of HLSResource. r=gerald

MozReview-Commit-ID: 3RaLXA1kKzA

--HG--
extra : rebase_source : 9cc0d22671ff866ece5d3773e1efcda15c966fa4
extra : intermediate-source : 51fb3c2b3834f04b3fa944f02b230b4365557060
extra : source : 08a811cbddc2477f79985b5a9b5c20743a718b12

dom/media/hls/HLSDecoder.cpp

@@ -73,7 +73,7 @@ HLSDecoder::Load(nsIChannel* aChannel)
     return rv;
   }
 
-  mResource = new HLSResource(this, aChannel, uri);
+  mResource = MakeUnique<HLSResource>(this, aChannel, uri);
 
   rv = MediaShutdownManager::Instance().Register(this);
   if (NS_WARN_IF(NS_FAILED(rv))) {

dom/media/hls/HLSDecoder.h

@@ -58,7 +58,7 @@ private:
 
   bool IsLiveStream() override final { return false; }
 
-  RefPtr<HLSResource> mResource;
+  UniquePtr<HLSResource> mResource;
 };
 
 } // namespace mozilla

dom/media/hls/HLSResource.h

@@ -10,11 +10,8 @@
 #include "GeneratedJNINatives.h"
 #include "GeneratedJNIWrappers.h"
 #include "HLSUtils.h"
-#include "MediaResource.h"
 #include "nsContentUtils.h"
 
-#define UNIMPLEMENTED() HLS_DEBUG("HLSResource", "UNIMPLEMENTED FUNCTION")
-
 using namespace mozilla::java;
 
 namespace mozilla {
@@ -41,23 +38,13 @@ private:
   HLSResource* mResource;
 };
 
-class HLSResource final : public MediaResource
+class HLSResource final
 {
 public:
   HLSResource(HLSDecoder* aDecoder, nsIChannel* aChannel, nsIURI* aURI);
   ~HLSResource();
   void Suspend();
   void Resume();
-  nsresult ReadAt(int64_t aOffset, char* aBuffer, uint32_t aCount, uint32_t* aBytes) override { UNIMPLEMENTED(); return NS_ERROR_FAILURE; }
-  bool ShouldCacheReads() override { UNIMPLEMENTED(); return false; }
-  int64_t Tell() override { UNIMPLEMENTED(); return -1; }
-  void Pin() override { UNIMPLEMENTED(); }
-  void Unpin() override { UNIMPLEMENTED(); }
-  int64_t GetLength() override { UNIMPLEMENTED(); return -1; }
-  int64_t GetNextCachedData(int64_t aOffset) override { UNIMPLEMENTED(); return -1; }
-  int64_t GetCachedDataEnd(int64_t aOffset) override { UNIMPLEMENTED(); return -1; }
-  bool IsDataCachedToEndOfResource(int64_t aOffset) override { UNIMPLEMENTED(); return false; }
-  nsresult ReadFromCache(char* aBuffer, int64_t aOffset, uint32_t aCount) override { UNIMPLEMENTED(); return NS_ERROR_FAILURE; }
 
   already_AddRefed<nsIPrincipal> GetCurrentPrincipal()
   {
@@ -71,12 +58,6 @@ public:
     return principal.forget();
   }
 
-  nsresult GetCachedRanges(MediaByteRangeSet& aRanges) override
-  {
-    UNIMPLEMENTED();
-    return NS_OK;
-  }
-
   java::GeckoHLSResourceWrapper::GlobalRef GetResourceWrapper() {
     return mHLSResourceWrapper;
   }