Backed out changeset eb14a49fc4df (bug 1549825) for causing browser_aboutURLs.js to perma fail CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Tue, 14 May 2019 01:12:38 +0300
changeset 532498 b59a173dc59b14271f9b33249dc8ce194afcd75c
parent 532497 ff1f9537eaae4cb4eb9385b4442566b5fb710bd6
child 532499 5a993bd3862b7a5b40771c25d962ba9c30ce76de
push id11268
push usercsabou@mozilla.com
push dateTue, 14 May 2019 15:24:22 +0000
treeherdermozilla-beta@5fb7fcd568d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1549825
milestone68.0a1
backs outeb14a49fc4df556927806f4f810329c90f46cd02
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset eb14a49fc4df (bug 1549825) for causing browser_aboutURLs.js to perma fail CLOSED TREE
browser/components/about/AboutRedirector.cpp
browser/components/about/components.conf
browser/components/protections/content/protections.css
browser/components/protections/content/protections.html
browser/components/protections/content/protections.js
browser/components/protections/jar.mn
browser/components/protections/moz.build
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -110,20 +110,16 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"restartrequired", "chrome://browser/content/aboutRestartRequired.xhtml",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"newinstall", "chrome://browser/content/newInstallPage.html",
      nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-    {"protections", "chrome://browser/content/protections/protections.html",
-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
-         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGED_CHILD},
 };
 
 static nsAutoCString GetAboutModuleName(nsIURI* aURI) {
   nsAutoCString path;
   aURI->GetPathQueryRef(path);
 
   int32_t f = path.FindChar('#');
   if (f >= 0) path.SetLength(f);
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@@ -14,17 +14,16 @@ pages = [
     'logins',
     'newinstall',
     'newtab',
     'pocket-saved',
     'pocket-signup',
     'policies',
     'preferences',
     'privatebrowsing',
-    'protections',
     'reader',
     'restartrequired',
     'rights',
     'robots',
     'sessionrestore',
     'tabcrashed',
     'welcome',
     'welcomeback',
deleted file mode 100644
--- a/browser/components/protections/content/protections.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 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/. */
-.under-construction {
-    background-image: url("chrome://browser/content/illustrations/under-construction.svg");
-    background-repeat: no-repeat;
-    background-position: center;
-    min-height: 300px;
-    min-width: 300px;
-    /* Move the image down a bit - should be slightly higher than halfway down the page */
-    margin-top: -10%;
-}
deleted file mode 100644
--- a/browser/components/protections/content/protections.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- 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/. -->
-
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:">
-    <link rel="stylesheet" media="screen, projection" type="text/css"
-          href="chrome://global/skin/in-content/info-pages.css" title="infop">
-    <link rel="stylesheet" type="text/css"
-          href="chrome://browser/content/protections/protections.css">
-    <script src="chrome://browser/content/protections/protections.js"></script>
-    <link rel="icon" href="chrome://global/skin/icons/warning.svg">
-    <link rel="localization" href="browser/aboutProtections.ftl">
-    <title>Protection Report</title>
-  </head>
-
-  <body>
-    <div class="under-construction"><div/>
-  </body>
-</html>
deleted file mode 100644
deleted file mode 100644
--- a/browser/components/protections/jar.mn
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/.
-
-browser.jar:
-   content/browser/protections.html             (content/protections.html)
-
deleted file mode 100644
--- a/browser/components/protections/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
-
-with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Tracking Protection')