Remove more telemetry/unused files

4 files changed, 0 insertions, 170 deletions

diff --git a/base/content/browser-data-submission-info-bar.js b/base/content/browser-data-submission-info-bar.js
deleted file mode 100644
index bb76903..0000000
--- a/base/content/browser-data-submission-info-bar.js
+++ /dev/null
@@ -1,121 +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/. */
-
-/**
- * Represents an info bar that shows a data submission notification.
- */
-var gDataNotificationInfoBar = {
-  _OBSERVERS: [
-    "datareporting:notify-data-policy:request",
-    "datareporting:notify-data-policy:close",
-  ],
-
-  _DATA_REPORTING_NOTIFICATION: "data-reporting",
-
-  get _notificationBox() {
-    delete this._notificationBox;
-    return this._notificationBox = document.getElementById("global-notificationbox");
-  },
-
-  get _log() {
-  },
-
-  init: function() {
-    window.addEventListener("unload", () => {
-      for (let o of this._OBSERVERS) {
-        Services.obs.removeObserver(this, o);
-      }
-    }, false);
-
-    for (let o of this._OBSERVERS) {
-      Services.obs.addObserver(this, o, true);
-    }
-  },
-
-  _getDataReportingNotification: function (name=this._DATA_REPORTING_NOTIFICATION) {
-    return this._notificationBox.getNotificationWithValue(name);
-  },
-
-  _displayDataPolicyInfoBar: function (request) {
-    if (this._getDataReportingNotification()) {
-      return;
-    }
-
-    let brandBundle = document.getElementById("bundle_brand");
-    let appName = brandBundle.getString("brandShortName");
-    let vendorName = brandBundle.getString("vendorShortName");
-
-    let message = gNavigatorBundle.getFormattedString(
-      "dataReportingNotification.message",
-      [appName, vendorName]);
-
-    this._actionTaken = false;
-
-    let buttons = [{
-      label: gNavigatorBundle.getString("dataReportingNotification.button.label"),
-      accessKey: gNavigatorBundle.getString("dataReportingNotification.button.accessKey"),
-      popup: null,
-      callback: () => {
-        this._actionTaken = true;
-        window.openAdvancedPreferences("dataChoicesTab");
-      },
-    }];
-
-    this._log.info("Creating data reporting policy notification.");
-    this._notificationBox.appendNotification(
-      message,
-      this._DATA_REPORTING_NOTIFICATION,
-      null,
-      this._notificationBox.PRIORITY_INFO_HIGH,
-      buttons,
-      event => {
-        if (event == "removed") {
-          Services.obs.notifyObservers(null, "datareporting:notify-data-policy:close", null);
-        }
-      }
-    );
-    // It is important to defer calling onUserNotifyComplete() until we're
-    // actually sure the notification was displayed. If we ever called
-    // onUserNotifyComplete() without showing anything to the user, that
-    // would be very good for user choice. It may also have legal impact.
-    request.onUserNotifyComplete();
-  },
-
-  _clearPolicyNotification: function () {
-    let notification = this._getDataReportingNotification();
-    if (notification) {
-      this._log.debug("Closing notification.");
-      notification.close();
-    }
-  },
-
-  observe: function(subject, topic, data) {
-    switch (topic) {
-      case "datareporting:notify-data-policy:request":
-        let request = subject.wrappedJSObject.object;
-        try {
-          this._displayDataPolicyInfoBar(request);
-        } catch (ex) {
-          request.onUserNotifyFailed(ex);
-          return;
-        }
-        break;
-
-      case "datareporting:notify-data-policy:close":
-        // If this observer fires, it means something else took care of
-        // responding. Therefore, we don't need to do anything. So, we
-        // act like we took action and clear state.
-        this._actionTaken = true;
-        this._clearPolicyNotification();
-        break;
-
-      default:
-    }
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
-  ]),
-};
diff --git a/base/content/browser-trackingprotection.js b/base/content/browser-trackingprotection.js
index 22092dd..426ed70 100644
--- a/base/content/browser-trackingprotection.js
+++ b/base/content/browser-trackingprotection.js
@@ -27,9 +27,6 @@ var TrackingProtection = {
       gNavigatorBundle.getString("trackingProtection.icon.activeTooltip");
     this.disabledTooltipText =
       gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip");
-
-    this.enabledHistogramAdd(this.enabledGlobally);
-    this.disabledPBMHistogramAdd(!this.enabledInPrivateWindows);
   },
 
   uninit() {
@@ -55,34 +52,6 @@ var TrackingProtection = {
     this.container.hidden = !this.enabled;
   },
 
-  enabledHistogramAdd(value) {
-    if (PrivateBrowsingUtils.isWindowPrivate(window)) {
-      return;
-    }
-    Services.telemetry.getHistogramById("TRACKING_PROTECTION_ENABLED").add(value);
-  },
-
-  disabledPBMHistogramAdd(value) {
-    if (PrivateBrowsingUtils.isWindowPrivate(window)) {
-      return;
-    }
-    Services.telemetry.getHistogramById("TRACKING_PROTECTION_PBM_DISABLED").add(value);
-  },
-
-  eventsHistogramAdd(value) {
-    if (PrivateBrowsingUtils.isWindowPrivate(window)) {
-      return;
-    }
-    Services.telemetry.getHistogramById("TRACKING_PROTECTION_EVENTS").add(value);
-  },
-
-  shieldHistogramAdd(value) {
-    if (PrivateBrowsingUtils.isWindowPrivate(window)) {
-      return;
-    }
-    Services.telemetry.getHistogramById("TRACKING_PROTECTION_SHIELD").add(value);
-  },
-
   onSecurityChange(state, isSimulated) {
     if (!this.enabled) {
       return;
@@ -104,24 +73,17 @@ var TrackingProtection = {
       this.icon.setAttribute("state", "blocked-tracking-content");
       this.content.setAttribute("state", "blocked-tracking-content");
 
-      this.shieldHistogramAdd(2);
     } else if (isAllowing) {
       this.icon.setAttribute("tooltiptext", this.disabledTooltipText);
       this.icon.setAttribute("state", "loaded-tracking-content");
       this.content.setAttribute("state", "loaded-tracking-content");
 
-      this.shieldHistogramAdd(1);
     } else {
       this.icon.removeAttribute("tooltiptext");
       this.icon.removeAttribute("state");
       this.content.removeAttribute("state");
 
-      // We didn't show the shield
-      this.shieldHistogramAdd(0);
     }
-
-    // Telemetry for state change.
-    this.eventsHistogramAdd(0);
   },
 
   disableForCurrentPage() {
@@ -142,9 +104,6 @@ var TrackingProtection = {
         "trackingprotection", Services.perms.ALLOW_ACTION);
     }
 
-    // Telemetry for disable protection.
-    this.eventsHistogramAdd(1);
-
     // Hide the control center.
     document.getElementById("identity-popup").hidePopup();
 
@@ -165,9 +124,6 @@ var TrackingProtection = {
       Services.perms.remove(normalizedUrl, "trackingprotection");
     }
 
-    // Telemetry for enable protection.
-    this.eventsHistogramAdd(2);
-
     // Hide the control center.
     document.getElementById("identity-popup").hidePopup();
 
diff --git a/base/content/global-scripts.inc b/base/content/global-scripts.inc
index ffaeeb4..e11f4e9 100755
--- a/base/content/global-scripts.inc
+++ b/base/content/global-scripts.inc
@@ -25,7 +25,3 @@
 <script type="application/javascript" src="chrome://browser/content/browser-tabsintitlebar.js"/>
 <script type="application/javascript" src="chrome://browser/content/browser-thumbnails.js"/>
 <script type="application/javascript" src="chrome://browser/content/browser-trackingprotection.js"/>
-
-#ifdef MOZ_DATA_REPORTING
-<script type="application/javascript" src="chrome://browser/content/browser-data-submission-info-bar.js"/>
-#endif
diff --git a/base/jar.mn b/base/jar.mn
index 3f661be..03be5bd 100644
--- a/base/jar.mn
+++ b/base/jar.mn
@@ -65,7 +65,6 @@ browser.jar:
         content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
         content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
         content/browser/browser-customization.js      (content/browser-customization.js)
-        content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
         content/browser/browser-feeds.js              (content/browser-feeds.js)
         content/browser/browser-fullScreenAndPointerLock.js  (content/browser-fullScreenAndPointerLock.js)
         content/browser/browser-fullZoom.js           (content/browser-fullZoom.js)