Bug 1254858: P4. Allow to pass mimetype in constructor. r=kentuckyfriedtakahe
MozReview-Commit-ID: 1viNCf5quO5
--- a/dom/media/gtest/MockMediaResource.cpp
+++ b/dom/media/gtest/MockMediaResource.cpp
@@ -5,20 +5,20 @@
#include "MockMediaResource.h"
#include <sys/types.h>
#include <sys/stat.h>
namespace mozilla
{
-MockMediaResource::MockMediaResource(const char* aFileName)
+MockMediaResource::MockMediaResource(const char* aFileName, const nsACString& aContentType)
: mFileHandle(nullptr)
, mFileName(aFileName)
- , mContentType(NS_LITERAL_CSTRING("video/mp4"))
+ , mContentType(aContentType)
{
}
nsresult
MockMediaResource::Open(nsIStreamListener** aStreamListener)
{
mFileHandle = fopen(mFileName, "rb");
if (mFileHandle == nullptr) {
--- a/dom/media/gtest/MockMediaResource.h
+++ b/dom/media/gtest/MockMediaResource.h
@@ -10,17 +10,17 @@
#include "mozilla/Atomics.h"
namespace mozilla
{
class MockMediaResource : public MediaResource
{
public:
- explicit MockMediaResource(const char* aFileName);
+ explicit MockMediaResource(const char* aFileName, const nsACString& aMimeType = NS_LITERAL_CSTRING("video/mp4"));
nsIURI* URI() const override { return nullptr; }
nsresult Close() override { return NS_OK; }
void Suspend(bool aCloseImmediately) override {}
void Resume() override {}
already_AddRefed<nsIPrincipal> GetCurrentPrincipal() override
{
return nullptr;
}
@@ -70,14 +70,14 @@ public:
protected:
virtual ~MockMediaResource();
private:
FILE* mFileHandle;
const char* mFileName;
MediaByteRangeSet mRanges;
Atomic<int> mEntry;
- nsCString mContentType;
+ const nsCString mContentType;
};
} // namespace mozilla
#endif