Bug 1329543 - Remove Adobe from GMP backup downloader. r=mconley
authorChris Pearce <cpearce@mozilla.com>
Sat, 14 Jan 2017 16:30:43 +0800
changeset 357872 c4594994e460ba77ac186032297480eb1f52f4e1
parent 357871 8b358c1267b2f770ec2bdbdf1ce23989a2cbf8a4
child 357873 ee5ca22bfa3699cc71fb089968e96e842d33f2b0
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1329543
milestone53.0a1
Bug 1329543 - Remove Adobe from GMP backup downloader. r=mconley MozReview-Commit-ID: 4wWso4j4Kwd
toolkit/content/gmp-sources/eme-adobe.json
toolkit/content/jar.mn
toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
deleted file mode 100644
--- a/toolkit/content/gmp-sources/eme-adobe.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "vendors": {
-    "gmp-eme-adobe": {
-      "platforms": {
-        "WINNT_x86-msvc-x64": {
-          "alias": "WINNT_x86-msvc"
-        },
-        "WINNT_x86-msvc": {
-          "fileUrl": "https://cdmdownload.adobe.com/firefox/win/x86/primetime_gmp_win_x86_gmc_40673.zip",
-          "hashValue": "8aad35fc13814b0f1daacddb0d599eedd685287d5afddc97c2f740c8aea270636ccd75b1d1a57364b84e8eb1b23c9f1c126c057d95f3d8217b331dc4b1d5340f",
-          "filesize": 3694349
-        },
-        "WINNT_x86_64-msvc-x64": {
-          "alias": "WINNT_x86_64-msvc"
-        },
-        "WINNT_x86-msvc-x86": {
-          "alias": "WINNT_x86-msvc"
-        },
-        "WINNT_x86_64-msvc": {
-          "fileUrl": "https://cdmdownload.adobe.com/firefox/win/x64/primetime_gmp_win_x64_gmc_40673.zip",
-          "hashValue": "bd1e1a370c5f9dadc247c9f00dd203fab1a75ff3afed8439a0a0bfcc7e1767d0da68497140cbe48daa70e2535dde5f220dd7b344619cecd830a6b685efb9d5a0",
-          "filesize": 4853103
-        }
-      },
-      "version": "17"
-    }
-  },
-  "hashFunction": "sha512",
-  "name": "CDM-17",
-  "schema_version": 1000
-}
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -113,11 +113,10 @@ toolkit.jar:
    content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
 *  content/global/bindings/tree.xml            (widgets/tree.xml)
    content/global/bindings/videocontrols.xml   (widgets/videocontrols.xml)
    content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
 *  content/global/bindings/wizard.xml          (widgets/wizard.xml)
 #ifdef XP_MACOSX
    content/global/macWindowMenu.js
 #endif
-   content/global/gmp-sources/eme-adobe.json   (gmp-sources/eme-adobe.json)
    content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
    content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
\ No newline at end of file
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
@@ -4,19 +4,16 @@
 
 "use strict";
 
 /* exported ProductAddonChecker */
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 const LOCAL_EME_SOURCES = [{
-  "id": "gmp-eme-adobe",
-  "src": "chrome://global/content/gmp-sources/eme-adobe.json"
-}, {
   "id": "gmp-gmpopenh264",
   "src": "chrome://global/content/gmp-sources/openh264.json"
 }, {
   "id": "gmp-widevinecdm",
   "src": "chrome://global/content/gmp-sources/widevinecdm.json"
 }];
 
 this.EXPORTED_SYMBOLS = [ "ProductAddonChecker" ];