From 44ad3cfc99b8b87fe1a63eea2188dddf3dbc82c3 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Thu, 5 Sep 2019 09:50:49 +0300
Subject: [PATCH] Backed out changeset 4b003634e1a7 (bug 1577031) for
 browser-chrome failures related to UITour. CLOSED TREE

---
 browser/components/uitour/UITour-lib.js       |  8 ------
 browser/components/uitour/UITour.jsm          | 16 -----------
 browser/components/uitour/test/browser.ini    |  2 --
 .../browser_UITour_showProtectionReport.js    | 28 -------------------
 4 files changed, 54 deletions(-)
 delete mode 100644 browser/components/uitour/test/browser_UITour_showProtectionReport.js

diff --git a/browser/components/uitour/UITour-lib.js b/browser/components/uitour/UITour-lib.js
index 582363993a91..9a32e71b3020 100644
--- a/browser/components/uitour/UITour-lib.js
+++ b/browser/components/uitour/UITour-lib.js
@@ -371,14 +371,6 @@ if (typeof Mozilla == "undefined") {
     _sendEvent("showNewTab");
   };
 
-  /**
-   * Loads about:protections in the tour tab.
-   * @since 70
-   */
-  Mozilla.UITour.showProtectionReport = function() {
-    _sendEvent("showProtectionReport");
-  };
-
   /**
    * @typedef Mozilla.UITour.ConfigurationName
    * @description Valid values:<ul>
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index f11b524e1db8..098501515a85 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -709,11 +709,6 @@ var UITour = {
         }
         break;
       }
-
-      case "showProtectionReport": {
-        this.showProtectionReport(window, browser);
-        break;
-      }
     }
 
     // For performance reasons, only call initForBrowser if we did something
@@ -1559,17 +1554,6 @@ var UITour = {
     });
   },
 
-  showProtectionReport(aWindow, aBrowser) {
-    let url = "about:protections";
-    aWindow.openLinkIn(url, "current", {
-      targetBrowser: aBrowser,
-      triggeringPrincipal: Services.scriptSecurityManager.createContentPrincipal(
-        Services.io.newURI(url),
-        {}
-      ),
-    });
-  },
-
   _hideAnnotationsForPanel(aEvent, aShouldClosePanel, aTargetPositionCallback) {
     let win = aEvent.target.ownerGlobal;
     let hideHighlightMethod = null;
diff --git a/browser/components/uitour/test/browser.ini b/browser/components/uitour/test/browser.ini
index 178646b1c10f..90558af05e15 100644
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -38,8 +38,6 @@ skip-if = true # Disabled pending removal of pocket UI Tour
 skip-if = (verify && !debug && (os == 'linux'))
 [browser_UITour_showNewTab.js]
 skip-if = (verify && !debug && (os == 'linux'))
-[browser_UITour_showProtectionReport.js]
-skip-if = (verify && !debug && (os == 'linux'))
 [browser_UITour_sync.js]
 [browser_UITour_toggleReaderMode.js]
 skip-if = (verify && !debug && (os == 'linux'))
diff --git a/browser/components/uitour/test/browser_UITour_showProtectionReport.js b/browser/components/uitour/test/browser_UITour_showProtectionReport.js
deleted file mode 100644
index f807b61d39ad..000000000000
--- a/browser/components/uitour/test/browser_UITour_showProtectionReport.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-var gTestTab;
-var gContentAPI;
-var gContentWindow;
-
-add_task(setup_UITourTest);
-
-// Test that we can switch to about:protections
-add_UITour_task(async function test_openProtectionReport() {
-  let aboutProtectionsLoaded = BrowserTestUtils.browserLoaded(
-    gBrowser.selectedBrowser,
-    false,
-    "about:protections"
-  );
-  info("Showing about:protections");
-  await gContentAPI.showProtectionReport();
-  info("Waiting for about:protections to load");
-  await aboutProtectionsLoaded;
-  is(
-    gBrowser.selectedBrowser.currentURI.spec,
-    "about:protections",
-    "Loaded about:protections"
-  );
-});