Bug 1403830 - [Part2] Remove unnecessary code and include header using gmp-platform.h. r=cpearce

MozReview-Commit-ID: huebQ9Ihs8

--HG--
extra : rebase_source : ff8cd329bf19f4158ac435f644c4c9dae44d890c

dom/media/gmp/ChromiumCDMAdapter.cpp

@@ -9,7 +9,6 @@
 #include "VideoUtils.h"
 #include "gmp-api/gmp-entrypoints.h"
 #include "gmp-api/gmp-video-codec.h"
-#include "gmp-api/gmp-platform.h"
 #include "WidevineUtils.h"
 #include "GMPLog.h"
 #include "mozilla/Move.h"

dom/media/gmp/widevine-adapter/WidevineFileIO.cpp

@@ -2,6 +2,8 @@
 #include "GMPLog.h"
 #include "WidevineUtils.h"
 
+#include "gmp-api/gmp-platform.h"
+
 using namespace cdm;
 
 // Declared in ChromiumCDMAdapter.cpp.

dom/media/gmp/widevine-adapter/WidevineUtils.cpp

@@ -12,21 +12,6 @@
 
 namespace mozilla {
 
-GMPErr
-ToGMPErr(cdm::Status aStatus)
-{
-  switch (aStatus) {
-    case cdm::kSuccess: return GMPNoErr;
-    case cdm::kNeedMoreData: return GMPGenericErr;
-    case cdm::kNoKey: return GMPNoKeyErr;
-    case cdm::kInitializationError: return GMPGenericErr;
-    case cdm::kDecryptError: return GMPCryptoErr;
-    case cdm::kDecodeError: return GMPDecodeErr;
-    case cdm::kDeferredInitialization: return GMPGenericErr;
-    default: return GMPGenericErr;
-  }
-}
-
 WidevineBuffer::WidevineBuffer(size_t aSize)
 {
   GMP_LOG("WidevineBuffer(size=%zu) created", aSize);

dom/media/gmp/widevine-adapter/WidevineUtils.h

@@ -8,7 +8,6 @@
 
 #include "stddef.h"
 #include "content_decryption_module.h"
-#include "gmp-api/gmp-platform.h"
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"
 #include "mozilla/Logging.h"
@@ -31,9 +30,6 @@ namespace mozilla {
     }                                                                          \
   }
 
-GMPErr
-ToGMPErr(cdm::Status aStatus);
-
 namespace gmp {
 class CDMShmemBuffer;
 }