Backed out 5 changesets (bug 1555236) for causing browser chrome failures on browser_trackingUI_report_breakage.js CLOSED TREE
authorarthur.iakab <aiakab@mozilla.com>
Wed, 03 Jul 2019 17:02:01 +0300
changeset 540761 683a10931b199dccaa5e5f6ce4da4646f689181d
parent 540760 6a8416a34d7827374e910607cac568d46cbd153c
child 540762 bce0c13b8071548cdd112ef725dbf14ef88c609b
push id11529
push userarchaeopteryx@coole-files.de
push dateThu, 04 Jul 2019 15:22:33 +0000
treeherdermozilla-beta@ebb510a784b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1555236
milestone69.0a1
backs out866ffc49eb1115a70838b911197bcb9ccbb5ee1f
24fda9469423ae76fdaff0e2a273a2c475e9df21
7b6d88faaab25837018b6f12cfdf7078c6ab6e40
33c1b3a1948396623611cc2b985dd19493b0385e
9f5563adc0de04769ed2cb69d21ecb4e26c9cc32
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 5 changesets (bug 1555236) for causing browser chrome failures on browser_trackingUI_report_breakage.js CLOSED TREE Backed out changeset 866ffc49eb11 (bug 1555236) Backed out changeset 24fda9469423 (bug 1555236) Backed out changeset 7b6d88faaab2 (bug 1555236) Backed out changeset 33c1b3a19483 (bug 1555236) Backed out changeset 9f5563adc0de (bug 1555236)
browser/base/content/browser-contentblocking.js
browser/base/content/browser-siteProtections.js
browser/base/content/test/siteProtections/browser_protections_UI.js
browser/components/controlcenter/content/identityPanel.inc.xul
browser/components/controlcenter/content/protectionsPanel.inc.xul
browser/themes/shared/controlcenter/panel.inc.css
--- a/browser/base/content/browser-contentblocking.js
+++ b/browser/base/content/browser-contentblocking.js
@@ -966,51 +966,46 @@ var ContentBlocking = {
   openPreferences(origin) {
     openPreferences("privacy-trackingprotection", { origin });
   },
 
   backToMainView() {
     this.identityPopupMultiView.goBack();
   },
 
-  onSubmitBreakageReportClicked() {
+  submitBreakageReport() {
     this.identityPopup.hidePopup();
 
-    let comments = document.getElementById(
-      "identity-popup-breakageReportView-collection-comments").value;
-    this.submitBreakageReport(this.reportURI, comments);
-  },
-
-  submitBreakageReport(uri, comments) {
     let reportEndpoint = Services.prefs.getStringPref(this.PREF_REPORT_BREAKAGE_URL);
     if (!reportEndpoint) {
       return;
     }
 
     let formData = new FormData();
-    formData.set("title", uri.host);
+    formData.set("title", this.reportURI.host);
 
     // Leave the ? at the end of the URL to signify that this URL had its query stripped.
-    let urlWithoutQuery = uri.asciiSpec.replace(uri.query, "");
+    let urlWithoutQuery = this.reportURI.asciiSpec.replace(this.reportURI.query, "");
     let body = `Full URL: ${urlWithoutQuery}\n`;
     body += `userAgent: ${navigator.userAgent}\n`;
 
     body += "\n**Preferences**\n";
     body += `${TrackingProtection.PREF_ENABLED_GLOBALLY}: ${Services.prefs.getBoolPref(TrackingProtection.PREF_ENABLED_GLOBALLY)}\n`;
     body += `${TrackingProtection.PREF_ENABLED_IN_PRIVATE_WINDOWS}: ${Services.prefs.getBoolPref(TrackingProtection.PREF_ENABLED_IN_PRIVATE_WINDOWS)}\n`;
     body += `urlclassifier.trackingTable: ${Services.prefs.getStringPref("urlclassifier.trackingTable")}\n`;
     body += `network.http.referer.defaultPolicy: ${Services.prefs.getIntPref("network.http.referer.defaultPolicy")}\n`;
     body += `network.http.referer.defaultPolicy.pbmode: ${Services.prefs.getIntPref("network.http.referer.defaultPolicy.pbmode")}\n`;
     body += `${ThirdPartyCookies.PREF_ENABLED}: ${Services.prefs.getIntPref(ThirdPartyCookies.PREF_ENABLED)}\n`;
     body += `network.cookie.lifetimePolicy: ${Services.prefs.getIntPref("network.cookie.lifetimePolicy")}\n`;
     body += `privacy.restrict3rdpartystorage.expiration: ${Services.prefs.getIntPref("privacy.restrict3rdpartystorage.expiration")}\n`;
     body += `${Fingerprinting.PREF_ENABLED}: ${Services.prefs.getBoolPref(Fingerprinting.PREF_ENABLED)}\n`;
     body += `${Cryptomining.PREF_ENABLED}: ${Services.prefs.getBoolPref(Cryptomining.PREF_ENABLED)}\n`;
 
-    body += "\n**Comments**\n" + comments;
+    let comments = document.getElementById("identity-popup-breakageReportView-collection-comments");
+    body += "\n**Comments**\n" + comments.value;
 
     formData.set("body", body);
 
     let activatedBlockers = [];
     for (let blocker of this.blockers) {
       if (blocker.activated) {
         activatedBlockers.push(blocker.reportBreakageLabel);
       }
--- a/browser/base/content/browser-siteProtections.js
+++ b/browser/base/content/browser-siteProtections.js
@@ -12,21 +12,16 @@ var gProtectionsHandler = {
   get _protectionsPopup() {
     delete this._protectionsPopup;
     return this._protectionsPopup = document.getElementById("protections-popup");
   },
   get _protectionsIconBox() {
     delete this._protectionsIconBox;
     return this._protectionsIconBox = document.getElementById("tracking-protection-icon-animatable-box");
   },
-  get _protectionsPopupMultiView() {
-    delete this._protectionsPopupMultiView;
-    return this._protectionsPopupMultiView =
-      document.getElementById("protections-popup-multiView");
-  },
   get _protectionsPopupMainView() {
     delete this._protectionsPopupMainView;
     return this._protectionsPopupMainView =
       document.getElementById("protections-popup-mainView");
   },
   get _protectionsPopupMainViewHeaderLabel() {
     delete this._protectionsPopupMainViewHeaderLabel;
     return this._protectionsPopupMainViewHeaderLabel =
@@ -52,31 +47,16 @@ var gProtectionsHandler = {
     return this._protectionPopupFooter =
       document.getElementById("protections-popup-footer");
   },
   get _protectionPopupTrackersCounterDescription() {
     delete this._protectionPopupTrackersCounterDescription;
     return this._protectionPopupTrackersCounterDescription =
       document.getElementById("protections-popup-trackers-blocked-counter-description");
   },
-  get _protectionsPopupSiteNotWorkingTPSwitch() {
-    delete this._protectionsPopupSiteNotWorkingTPSwitch;
-    return this._protectionsPopupSiteNotWorkingTPSwitch =
-      document.getElementById("protections-popup-siteNotWorking-tp-switch");
-  },
-  get _protectionsPopupSendReportLearnMore() {
-    delete this._protectionsPopupSendReportLearnMore;
-    return this._protectionsPopupSendReportLearnMore =
-      document.getElementById("protections-popup-sendReportView-learn-more");
-  },
-  get _protectionsPopupSendReportURL() {
-    delete this._protectionsPopupSendReportURL;
-    return this._protectionsPopupSendReportURL =
-      document.getElementById("protections-popup-sendReportView-collection-url");
-  },
   get _protectionsPopupToastTimeout() {
     delete this._protectionsPopupToastTimeout;
     XPCOMUtils.defineLazyPreferenceGetter(this, "_protectionsPopupToastTimeout",
                                           "browser.protections_panel.toast.timeout",
                                           5000);
     return this._protectionsPopupToastTimeout;
   },
 
@@ -143,30 +123,31 @@ var gProtectionsHandler = {
       // Hide the panel when focusing an element that is
       // neither an ancestor nor descendant unless the panel has
       // @noautohide (e.g. for a tour).
       PanelMultiView.hidePopup(this._protectionsPopup);
     }
   },
 
   refreshProtectionsPopup() {
+    // Refresh the state of the TP toggle switch.
+    this._protectionsPopupTPSwitch.toggleAttribute("enabled",
+      !this._protectionsPopup.hasAttribute("hasException"));
+
     let host = gIdentityHandler.getHostForDisplay();
 
     // Push the appropriate strings out to the UI.
     this._protectionsPopupMainViewHeaderLabel.textContent =
       // gNavigatorBundle.getFormattedString("protections.header", [host]);
       `Tracking Protections for ${host}`;
 
     let currentlyEnabled =
       !this._protectionsPopup.hasAttribute("hasException");
 
-    for (let tpSwitch of [this._protectionsPopupTPSwitch,
-                          this._protectionsPopupSiteNotWorkingTPSwitch]) {
-      tpSwitch.toggleAttribute("enabled", currentlyEnabled);
-    }
+    this._protectionsPopupTPSwitch.toggleAttribute("enabled", currentlyEnabled);
 
     // Display the breakage link according to the current enable state.
     // The display state of the breakage link will be fixed once the protections
     // panel opened no matter how the TP switch state is.
     this._protectionsPopupTPSwitchBreakageLink.hidden = !currentlyEnabled;
 
     // Set the counter of the 'Trackers blocked This Week'.
     // We need to get the statistics of trackers. So far, we haven't implemented
@@ -185,20 +166,17 @@ var gProtectionsHandler = {
     }
 
     this._TPSwitchCommanding = true;
 
     // Toggling the 'hasException' on the protections panel in order to do some
     // styling after toggling the TP switch.
     let newExceptionState =
       this._protectionsPopup.toggleAttribute("hasException");
-    for (let tpSwitch of [this._protectionsPopupTPSwitch,
-                          this._protectionsPopupSiteNotWorkingTPSwitch]) {
-      tpSwitch.toggleAttribute("enabled", !newExceptionState);
-    }
+    this._protectionsPopupTPSwitch.toggleAttribute("enabled", !newExceptionState);
 
     // Indicating that we need to show a toast after refreshing the page.
     // And caching the current URI and window ID in order to only show the mini
     // panel if it's still on the same page.
     this._showToastAfterRefresh = true;
     this._previousURI = gBrowser.currentURI.spec;
     this._previousOuterWindowID = gBrowser.selectedBrowser.outerWindowID;
 
@@ -265,32 +243,9 @@ var gProtectionsHandler = {
     }
 
     // Now open the popup, anchored off the primary chrome element
     PanelMultiView.openPopup(this._protectionsPopup, gIdentityHandler._identityIcon, {
       position: "bottomcenter topleft",
       triggerEvent: event,
     }).catch(Cu.reportError);
   },
-
-  showSiteNotWorkingView() {
-    this._protectionsPopupMultiView.showSubView("protections-popup-siteNotWorkingView");
-  },
-
-  showSendReportView() {
-    // Save this URI to make sure that the user really only submits the location
-    // they see in the report breakage dialog.
-    this.reportURI = gBrowser.currentURI;
-    let urlWithoutQuery = this.reportURI.asciiSpec.replace("?" + this.reportURI.query, "");
-    this._protectionsPopupSendReportURL.value = urlWithoutQuery;
-    this._protectionsPopupMultiView.showSubView("protections-popup-sendReportView");
-  },
-
-  onSendReportClicked() {
-    this._protectionsPopup.hidePopup();
-    let comments = document.getElementById(
-      "protections-popup-sendReportView-collection-comments").value;
-    ContentBlocking.submitBreakageReport(this.reportURI, comments);
-  },
 };
-
-let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
-gProtectionsHandler._protectionsPopupSendReportLearnMore.href = baseURL + "blocking-breakage";
--- a/browser/base/content/test/siteProtections/browser_protections_UI.js
+++ b/browser/base/content/test/siteProtections/browser_protections_UI.js
@@ -35,32 +35,16 @@ add_task(async function testToggleSwitch
   await popuphiddenPromise;
 
   await openProtectionsPanel();
   ok(!gProtectionsHandler._protectionsPopupTPSwitch.hasAttribute("enabled"), "TP Switch should be disabled");
   Services.perms.remove(ContentBlocking._baseURIForChannelClassifier, "trackingprotection");
   BrowserTestUtils.removeTab(tab);
 });
 
-add_task(async function testSiteNotWorking() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com");
-  await openProtectionsPanel();
-  let viewShownPromise = BrowserTestUtils.waitForEvent(
-    gProtectionsHandler._protectionsPopupMultiView, "ViewShown");
-  document.getElementById("protections-popup-tp-switch-breakage-link").click();
-  let event = await viewShownPromise;
-  is(event.originalTarget.id, "protections-popup-siteNotWorkingView", "Site Not Working? view should be shown");
-  viewShownPromise = BrowserTestUtils.waitForEvent(
-    gProtectionsHandler._protectionsPopupMultiView, "ViewShown");
-  document.getElementById("protections-popup-siteNotWorkingView-sendReport").click();
-  event = await viewShownPromise;
-  is(event.originalTarget.id, "protections-popup-sendReportView", "Send Report view should be shown");
-  BrowserTestUtils.removeTab(tab);
-});
-
 /**
  * A test for the protection settings button.
  */
 add_task(async function testSettingsButton() {
   // Open a tab and its protection panel.
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com");
   await openProtectionsPanel();
 
--- a/browser/components/controlcenter/content/identityPanel.inc.xul
+++ b/browser/components/controlcenter/content/identityPanel.inc.xul
@@ -341,13 +341,13 @@
         <vbox id="identity-popup-breakageReportView-footer"
               class="panel-footer">
           <button id="identity-popup-breakageReportView-cancel"
                   label="&contentBlocking.breakageReportView.cancel.label;"
                   oncommand="ContentBlocking.backToMainView();"/>
           <button id="identity-popup-breakageReportView-submit"
                   default="true"
                   label="&contentBlocking.breakageReportView.sendReport.label;"
-                  oncommand="ContentBlocking.onSubmitBreakageReportClicked();"/>
+                  oncommand="ContentBlocking.submitBreakageReport();"/>
         </vbox>
     </panelview>
   </panelmultiview>
 </panel>
--- a/browser/components/controlcenter/content/protectionsPanel.inc.xul
+++ b/browser/components/controlcenter/content/protectionsPanel.inc.xul
@@ -20,31 +20,29 @@
         <label id="protections-popup-main-header-label">
           <html:span id="protections-popup-mainView-panel-header-span"/>
         </label>
         <description id="protections-popup-toast-panel-tp-on-desc">Enhanced Tracking Protection is ON for this site</description>
         <description id="protections-popup-toast-panel-tp-off-desc">Enhanced Tracking Protection is OFF for this site</description>
       </hbox>
 
       <hbox id="protections-popup-tp-switch-section" class="identity-popup-section">
-        <vbox class="protections-popup-tp-switch-label-box" flex="1">
-          <label class="protections-popup-tp-switch-on-header"
+        <vbox id="protections-popup-tp-switch-label-box" flex="1">
+          <label id="protections-popup-tp-switch-on-header"
                  hidden="true">Tracking protection is ON for this site</label>
-          <label class="protections-popup-tp-switch-off-header"
+          <label id="protections-popup-tp-switch-off-header"
                  hidden="true">Tracking protection is OFF for this site</label>
           <label id="protections-popup-tp-switch-breakage-link"
                  class="text-link"
-                 onclick="gProtectionsHandler.showSiteNotWorkingView();"
                  hidden="true">Site not working?</label>
         </vbox>
-        <vbox class="protections-popup-tp-switch-box">
+        <vbox id="protections-popup-tp-switch-box">
           <toolbarbutton id="protections-popup-tp-switch"
-                         class="protections-popup-tp-switch"
-                         enabled="false"
-                         oncommand="gProtectionsHandler.onTPSwitchCommand();" />
+              enabled="false"
+              oncommand="gProtectionsHandler.onTPSwitchCommand();" />
         </vbox>
       </hbox>
 
       <vbox id="protections-popup-settings-section"
             class="identity-popup-section">
         <toolbarbutton id="protections-popup-settings-button"
                        oncommand="ContentBlocking.openPreferences();">
           <image class="protection-settings-icon"/>
@@ -56,82 +54,10 @@
         <description id="protections-popup-trackers-blocked-counter-description"
                      flex="1"/>
         <label id="protections-popup-show-full-report-link"
                is="text-link"
                useoriginprincipal="true"
                href="about:protections">Show Full Report</label>
       </hbox>
     </panelview>
-
-    <!-- Site Not Working? SubView -->
-    <panelview id="protections-popup-siteNotWorkingView"
-               title="Site Not Working?"
-               descriptionheightworkaround="true"
-               flex="1">
-        <hbox id="protections-popup-siteNotWorkingView-header">
-          <vbox class="protections-popup-tp-switch-label-box" flex="1">
-            <label class="protections-popup-tp-switch-on-header"
-              hidden="true">Tracking protection is ON for this site</label>
-            <label class="protections-popup-tp-switch-off-header"
-              hidden="true">Tracking protection is OFF for this site</label>
-          </vbox>
-          <vbox class="protections-popup-tp-switch-box">
-            <toolbarbutton id="protections-popup-siteNotWorking-tp-switch"
-                           class="protections-popup-tp-switch"
-                           enabled="false"
-                           oncommand="gProtectionsHandler.onTPSwitchCommand();" />
-          </vbox>
-        </hbox>
-        <vbox id="protections-popup-siteNotWorkingView-body" flex="1">
-          <label>Turn off Tracking Protection if you're having issues with:</label>
-          <label>
-            <html:ul id="protections-popup-siteNotWorkingView-body-issue-list">
-              <html:li>Log in fields</html:li>
-              <html:li>Forms</html:li>
-              <html:li>Payments</html:li>
-              <html:li>Comments</html:li>
-              <html:li>Videos</html:li>
-            </html:ul>
-          </label>
-        </vbox>
-        <hbox id="protections-popup-siteNotWorkingView-footer"
-              class="panel-footer">
-          <label id="protections-popup-siteNotWorkingView-siteStillBroken" flex="1">Site Still Broken?</label>
-          <label id="protections-popup-siteNotWorkingView-sendReport"
-            onclick="gProtectionsHandler.showSendReportView();"
-            class="text-link">Send Report</label>
-        </hbox>
-    </panelview>
-
-
-    <!-- Send Report SubView -->
-    <panelview id="protections-popup-sendReportView"
-               title="Send Report"
-               descriptionheightworkaround="true">
-        <vbox id="protections-popup-sendReportView-heading">
-          <description>&contentBlocking.breakageReportView2.description;</description>
-          <label id="protections-popup-sendReportView-learn-more"
-                 is="text-link">&contentBlocking.breakageReportView.learnMore;</label>
-        </vbox>
-        <vbox id="protections-popup-sendReportView-body" class="panel-view-body-unscrollable">
-          <vbox class="protections-popup-sendReportView-collection-section">
-            <label>&contentBlocking.breakageReportView.collection.url.label;</label>
-            <html:input readonly="readonly" id="protections-popup-sendReportView-collection-url"/>
-          </vbox>
-          <vbox class="protections-popup-sendReportView-collection-section">
-            <label>&contentBlocking.breakageReportView.collection.comments.label;</label>
-            <html:textarea id="protections-popup-sendReportView-collection-comments"/>
-          </vbox>
-        </vbox>
-        <vbox id="protections-popup-sendReportView-footer"
-              class="panel-footer">
-          <button id="protections-popup-sendReportView-cancel"
-                  label="&contentBlocking.breakageReportView.cancel.label;"
-                  oncommand="gProtectionsHandler._protectionsPopupMultiView.goBack();"/>
-          <button id="protections-popup-sendReportView-submit"
-                  default="true"
-                  label="&contentBlocking.breakageReportView.sendReport.label;"
-                  oncommand="gProtectionsHandler.onSendReportClicked();"/>
-        </vbox>
-    </panelview>
   </panelmultiview>
 </panel>
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -187,17 +187,16 @@
 .identity-popup-cookiesView-list-header,
 .identity-popup-content-blocking-list-item > label,
 #identity-popup-mainView-panel-header > label,
 #protections-popup-mainView-panel-header > label,
 #protections-popup-mainView-panel-header > description,
 #identity-popup-trackersView > .panel-header,
 #identity-popup-securityView > .panel-header,
 #identity-popup-breakageReportView > .panel-header,
-#protections-popup-sendReportView > .panel-header,
 #identity-popup-content-blocking-report-breakage,
 .identity-popup-content-blocking-category-label,
 .identity-popup-content-blocking-category-state-label,
 .identity-popup-permission-label,
 .identity-popup-permission-state-label,
 .identity-popup-security-content > description,
 #identity-popup-security-descriptions > description,
 #identity-popup-securityView-body > description,
@@ -206,18 +205,17 @@
 .protections-popup-settings-label,
 #protections-popup-footer > description,
 #protections-popup-footer > label {
   font-size: 110%;
   margin: 0;
 }
 
 #identity-popup-mainView-panel-header,
-#protections-popup-mainView-panel-header,
-#protections-popup-siteNotWorkingView-footer {
+#protections-popup-mainView-panel-header {
   padding: 4px 1em;
   min-height: 40px;
   -moz-box-pack: center;
   -moz-box-align: center;
 }
 
 #protections-popup > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow {
   fill: rgb(100, 70, 228);
@@ -368,51 +366,43 @@ description#identity-popup-content-verif
 
 #identity-popup-securityView-body > button {
   margin-inline-start: 0;
   margin-inline-end: 0;
 }
 
 /* CONTENT BLOCKING / TRACKING PROTECTION */
 
-#identity-popup-breakageReportView-footer,
-#protections-popup-sendReportView-footer {
+#identity-popup-breakageReportView-footer {
   display: flex;
 }
 
-#identity-popup-breakageReportView-footer > button,
-#protections-popup-sendReportView-footer > button {
+#identity-popup-breakageReportView-footer > button {
   flex: 1;
 }
 
 #identity-popup-breakageReportView-heading,
-#identity-popup-breakageReportView-body,
-#protections-popup-sendReportView-heading,
-#protections-popup-sendReportView-body {
+#identity-popup-breakageReportView-body {
   padding: 16px;
   font-size: 110%;
 }
 
-.identity-popup-breakageReportView-collection-section,
-.protections-popup-sendReportView-collection-section {
+.identity-popup-breakageReportView-collection-section {
   margin-bottom: 16px;
 }
 
-#identity-popup-breakageReportView-body,
-#protections-popup-sendReportView-body {
+#identity-popup-breakageReportView-body {
   border-top: 1px solid var(--panel-separator-color);
 }
 
-#identity-popup-breakageReportView-collection-url,
-#protections-popup-sendReportView-collection-url {
+#identity-popup-breakageReportView-collection-url {
   font: inherit;
 }
 
-#identity-popup-breakageReportView-collection-comments,
-#protections-popup-sendReportView-collection-comments {
+#identity-popup-breakageReportView-collection-comments {
   height: 120px;
 }
 
 #identity-popup-content-blocking-content {
   background-image: url("chrome://browser/skin/controlcenter/tracking-protection.svg");
 }
 
 .identity-popup-content-blocking-category {
@@ -816,18 +806,18 @@ description#identity-popup-content-verif
 .identity-popup-permission-remove-button:not(:-moz-focusring):hover:active {
   opacity: 0.8;
 }
 
 #protections-popup-mainView-panel-header > description {
   display: none;
 }
 
-#protections-popup:not([hasException]) .protections-popup-tp-switch-on-header,
-#protections-popup[hasException] .protections-popup-tp-switch-off-header,
+#protections-popup:not([hasException]) #protections-popup-tp-switch-on-header,
+#protections-popup[hasException] #protections-popup-tp-switch-off-header,
 #protections-popup:not([hasException])[toast] #protections-popup-toast-panel-tp-on-desc,
 #protections-popup[hasException][toast] #protections-popup-toast-panel-tp-off-desc {
   display: unset;
 }
 
 #protections-popup-tp-switch-section {
   padding: 4px;
 }
@@ -837,82 +827,73 @@ description#identity-popup-content-verif
     -56deg,
     var(--arrowpanel-dimmed),
     var(--arrowpanel-dimmed) 10px,
     transparent 10px,
     transparent 20px
   );
 }
 
-#protections-popup-siteNotWorkingView-body,
-.protections-popup-tp-switch-label-box,
-.protections-popup-tp-switch-box {
+#protections-popup-tp-switch-label-box,
+#protections-popup-tp-switch-box {
   padding: 4px 1em;
   min-height: 40px;
   -moz-box-pack: center;
   /* This is needed in order to make 'position' working for the badge alongside
      the TP switch toggle.*/
   position: relative;
 }
 
-.protections-popup-tp-switch-on-header,
-.protections-popup-tp-switch-off-header {
+#protections-popup-tp-switch-on-header,
+#protections-popup-tp-switch-off-header {
   font-weight: 600;
 }
 
-.protections-popup-tp-switch {
+#protections-popup-tp-switch {
   -moz-appearance: none;
   box-sizing: border-box;
   min-width: 26px;
   border-radius: 10px;
   background-color: var(--arrowpanel-dimmed-even-further);
   border: 1px solid transparent;
   margin-top: 4px;
   margin-bottom: 4px;
   margin-inline-start: 1px;
+  margin-inline-end: 7px;
   padding: 2px;
-  padding-inline-end: 0;
   transition: padding .2s ease;
 }
 
-.protections-popup-tp-switch::before {
+#protections-popup-tp-switch::before {
   position: relative;
   display: block;
   content: "";
   width: 10px;
   height: 10px;
   border-radius: 10px;
   background: white;
 }
 
-.protections-popup-tp-switch[enabled] {
+#protections-popup-tp-switch[enabled] {
   background-color: #0a84ff;
   border: 1px solid #0a84ff;
   /* Push the toggle to the right. */
   padding-inline-start: 12px;
 }
 
-.protections-popup-tp-switch:hover,
-.protections-popup-tp-switch:-moz-focusring {
+#protections-popup-tp-switch:hover,
+#protections-popup-tp-switch:-moz-focusring {
   border: 1px solid var(--panel-separator-color);
 }
 
-.protections-popup-tp-switch[enabled=true]:hover,
-.protections-popup-tp-switch[enabled=true]:-moz-focusring {
+#protections-popup-tp-switch[enabled=true]:hover,
+#protections-popup-tp-switch[enabled=true]:-moz-focusring {
   background-color: #45a1ff;
 }
 
-#protections-popup-siteNotWorkingView-body-issue-list {
-  padding-inline-start: 1em;
-}
-
-#protections-popup-siteNotWorkingView-footer {
-  border-top: 1px solid var(--panel-separator-color);
-}
-
 #protections-popup-settings-section {
   padding: 4px;
   -moz-context-properties: fill, fill-opacity;
 }
 
 #protections-popup-settings-button {
   /* We need to align the setting button with the labels in the tp switch
      section. So we add 6px to offset the margin of labels. */