Backed out changeset 82f3980be0c0 (bug 1713693) for build bustage on Linux. CLOSED TREE

browser/extensions/webcompat/data/shims.js

@@ -134,47 +134,6 @@ const AVAILABLE_SHIMS = [
     matches: ["*://auth.9c9media.ca/auth/main.js"],
     onlyIfBlockedByETP: true,
   },
-  {
-    id: "Doubleclick",
-    platform: "all",
-    name: "Doubleclick",
-    bug: "1713693",
-    matches: [
-      {
-        patterns: [
-          "*://securepubads.g.doubleclick.net/gampad/*ad-blk*",
-          "*://pubads.g.doubleclick.net/gampad/*ad-blk*",
-        ],
-        target: "empty-file.txt",
-        types: ["image", "imageset", "xmlhttprequest"],
-      },
-      {
-        patterns: [
-          "*://securepubads.g.doubleclick.net/gampad/*xml_vmap1*",
-          "*://pubads.g.doubleclick.net/gampad/*xml_vmap1*",
-        ],
-        target: "vmad.xml",
-        types: ["image", "imageset", "xmlhttprequest"],
-      },
-      {
-        patterns: [
-          "*://securepubads.g.doubleclick.net/gampad/*xml_vmap2*",
-          "*://pubads.g.doubleclick.net/gampad/*xml_vmap2*",
-        ],
-        target: "vast2.xml",
-        types: ["image", "imageset", "xmlhttprequest"],
-      },
-      {
-        patterns: [
-          "*://securepubads.g.doubleclick.net/gampad/*ad*",
-          "*://pubads.g.doubleclick.net/gampad/*ad*",
-        ],
-        target: "vast3.xml",
-        types: ["image", "imageset", "xmlhttprequest"],
-      },
-    ],
-    onlyIfBlockedByETP: true,
-  },
   {
     id: "Eluminate",
     platform: "all",

browser/extensions/webcompat/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "23.7.0",
+  "version": "23.6.0",
 
   "applications": {
     "gecko": {
@@ -93,7 +93,6 @@
     "shims/adsafeprotected-ima.js",
     "shims/bmauth.js",
     "shims/eluminate.js",
-    "shims/empty-file.txt",
     "shims/empty-script.js",
     "shims/facebook-sdk.js",
     "shims/facebook.svg",
@@ -108,9 +107,6 @@
     "shims/play.svg",
     "shims/rambler-authenticator.js",
     "shims/rich-relevance.js",
-    "shims/tracking-pixel.png",
-    "shims/vast2.xml",
-    "shims/vast3.xml",
-    "shims/vmad.xml"
+    "shims/tracking-pixel.png"
   ]
 }

browser/extensions/webcompat/moz.build

@@ -80,7 +80,6 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
     "shims/adsafeprotected-ima.js",
     "shims/bmauth.js",
     "shims/eluminate.js",
-    "shims/empty-file.txt",
     "shims/empty-script.js",
     "shims/facebook-sdk.js",
     "shims/facebook.svg",
@@ -96,9 +95,6 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
     "shims/rambler-authenticator.js",
     "shims/rich-relevance.js",
     "shims/tracking-pixel.png",
-    "shims/vast2.xml",
-    "shims/vast3.xml",
-    "shims/vmad.xml",
 ]
 
 FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["lib"] += [

browser/extensions/webcompat/shims/vast2.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-  Bug 1713693 - Shim Doubleclick
-
-  Some sites rely on an XML VAST Ad response from Doubleclick, or will
-  break (showing black boxes instead of videos, etc). This shim mitigates
-  such breakage.
--->
-<VAST version="2.0"></VAST>

browser/extensions/webcompat/shims/vast3.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-  Bug 1713693 - Shim Doubleclick
-
-  Some sites rely on an XML VAST Ad response from Doubleclick, or will
-  break (showing black boxes instead of videos, etc). This shim mitigates
-  such breakage.
--->
-<VAST version="3.0"></VAST>

browser/extensions/webcompat/shims/vmad.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-  Bug 1713693 - Shim Doubleclick
-
-  Some sites rely on an XML VMAD Ad response from Doubleclick, or will
-  break (showing black boxes instead of videos, etc). This shim mitigates
-  such breakage.
--->
-<vmap:AdBreak></vmap:AdBreak>