Merge branch 'master' into Goanna

10 files changed, 1 insertions, 319 deletions

diff --git a/browser/devtools/commandline/BuiltinCommands.jsm b/browser/devtools/commandline/BuiltinCommands.jsm
index fa1e3cc7d..670783eab 100644
--- a/browser/devtools/commandline/BuiltinCommands.jsm
+++ b/browser/devtools/commandline/BuiltinCommands.jsm
@@ -20,8 +20,6 @@ Cu.import("resource://gre/modules/devtools/gcli.jsm");
 Cu.import("resource:///modules/devtools/shared/event-emitter.js");
 
 var require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
-let Telemetry = require("devtools/shared/telemetry");
-let telemetry = new Telemetry();
 
 XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
                                   "resource:///modules/devtools/gDevTools.jsm");
@@ -1978,11 +1976,6 @@ gcli.addCommand({
     var window = context.environment.window;
     var wUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
                        .getInterface(Ci.nsIDOMWindowUtils);
-    if (wUtils.paintFlashing) {
-      telemetry.toolOpened("paintflashing");
-    } else {
-      telemetry.toolClosed("paintflashing");
-    }
   }
 }(this));
 
diff --git a/browser/devtools/debugger/DebuggerProcess.jsm b/browser/devtools/debugger/DebuggerProcess.jsm
index 962613836..037762b12 100644
--- a/browser/devtools/debugger/DebuggerProcess.jsm
+++ b/browser/devtools/debugger/DebuggerProcess.jsm
@@ -15,7 +15,6 @@ Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 
 let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
-let Telemetry = require("devtools/shared/telemetry");
 
 this.EXPORTED_SYMBOLS = ["BrowserDebuggerProcess"];
 
@@ -30,7 +29,6 @@ this.EXPORTED_SYMBOLS = ["BrowserDebuggerProcess"];
 this.BrowserDebuggerProcess = function BrowserDebuggerProcess(aOnClose, aOnRun) {
   this._closeCallback = aOnClose;
   this._runCallback = aOnRun;
-  this._telemetry = new Telemetry();
 
   this._initServer();
   this._initProfile();
@@ -117,8 +115,6 @@ BrowserDebuggerProcess.prototype = {
     let args = ["-no-remote", "-foreground", "-P", this._dbgProfile.name, "-chrome", DBG_XUL];
     process.runwAsync(args, args.length, { observe: () => this.close() });
 
-    this._telemetry.toolOpened("jsbrowserdebugger");
-
     dumpn("Chrome debugger is now running...");
     if (typeof this._runCallback == "function") {
       this._runCallback.call({}, this);
@@ -134,8 +130,6 @@ BrowserDebuggerProcess.prototype = {
       this._dbgProcess.kill();
     }
 
-    this._telemetry.toolClosed("jsbrowserdebugger");
-
     dumpn("Chrome debugger is now closed...");
     if (typeof this._closeCallback == "function") {
       this._closeCallback.call({}, this);
diff --git a/browser/devtools/framework/sidebar.js b/browser/devtools/framework/sidebar.js
index e312db451..48e373642 100644
--- a/browser/devtools/framework/sidebar.js
+++ b/browser/devtools/framework/sidebar.js
@@ -10,7 +10,6 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 var Promise = require("sdk/core/promise");
 var EventEmitter = require("devtools/shared/event-emitter");
-var Telemetry = require("devtools/shared/telemetry");
 
 const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -40,8 +39,6 @@ function ToolSidebar(tabbox, panel, uid, showTabstripe=true)
     this._width = Services.prefs.getIntPref("devtools.toolsidebar-width." + this._uid);
   } catch(e) {}
 
-  this._telemetry = new Telemetry();
-
   this._tabbox.tabpanels.addEventListener("select", this, true);
 
   this._tabs = new Map();
@@ -151,11 +148,9 @@ ToolSidebar.prototype = {
       let previousTool = this._currentTool;
       this._currentTool = this.getCurrentTabID();
       if (previousTool) {
-        this._telemetry.toolClosed(previousTool);
         this.emit(previousTool + "-unselected");
       }
 
-      this._telemetry.toolOpened(this._currentTool);
       this.emit(this._currentTool + "-selected");
       this.emit("select", this._currentTool);
     }
@@ -223,10 +218,6 @@ ToolSidebar.prototype = {
       this._tabbox.tabs.removeChild(this._tabbox.tabs.firstChild);
     }
 
-    if (this._currentTool) {
-      this._telemetry.toolClosed(this._currentTool);
-    }
-
     this._tabs = null;
     this._tabbox = null;
     this._panelDoc = null;
diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index 7288805a7..d6999d528 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -8,7 +8,6 @@ const {Cc, Ci, Cu} = require("chrome");
 const MAX_ORDINAL = 99;
 let Promise = require("sdk/core/promise");
 let EventEmitter = require("devtools/shared/event-emitter");
-let Telemetry = require("devtools/shared/telemetry");
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import("resource://gre/modules/Services.jsm");
@@ -59,7 +58,6 @@ XPCOMUtils.defineLazyGetter(this, "Requisition", function() {
 function Toolbox(target, selectedTool, hostType) {
   this._target = target;
   this._toolPanels = new Map();
-  this._telemetry = new Telemetry();
 
   this._toolRegistered = this._toolRegistered.bind(this);
   this._toolUnregistered = this._toolUnregistered.bind(this);
@@ -208,8 +206,6 @@ Toolbox.prototype = {
         this._buildButtons();
         this._addKeysToWindow();
 
-        this._telemetry.toolOpened("toolbox");
-
         this.selectTool(this._defaultToolId).then(function(panel) {
           this.emit("ready");
           deferred.resolve();
@@ -497,12 +493,7 @@ Toolbox.prototype = {
     }
     let tab = this.doc.getElementById("toolbox-tab-" + id);
 
-    if (tab) {
-      if (prevToolId) {
-        this._telemetry.toolClosed(prevToolId);
-      }
-      this._telemetry.toolOpened(id);
-    } else {
+    if (!tab) {
       throw new Error("No tool found");
     }
 
@@ -762,8 +753,6 @@ Toolbox.prototype = {
 
     outstanding.push(this._host.destroy());
 
-    this._telemetry.destroy();
-
     // Targets need to be notified that the toolbox is being torn down, so that
     // remote protocol connections can be gracefully terminated.
     if (this._target) {
diff --git a/browser/devtools/responsivedesign/responsivedesign.jsm b/browser/devtools/responsivedesign/responsivedesign.jsm
index b7122d3bb..896eafee6 100644
--- a/browser/devtools/responsivedesign/responsivedesign.jsm
+++ b/browser/devtools/responsivedesign/responsivedesign.jsm
@@ -14,7 +14,6 @@ Cu.import("resource:///modules/devtools/FloatingScrollbars.jsm");
 Cu.import("resource:///modules/devtools/shared/event-emitter.js");
 
 var require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
-let Telemetry = require("devtools/shared/telemetry");
 
 this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"];
 
@@ -111,7 +110,6 @@ function ResponsiveUI(aWindow, aTab)
   this.chromeDoc = aWindow.document;
   this.container = aWindow.gBrowser.getBrowserContainer(this.browser);
   this.stack = this.container.querySelector(".browserStack");
-  this._telemetry = new Telemetry();
 
   // Try to load presets from prefs
   if (Services.prefs.prefHasUserValue("devtools.responsiveUI.presets")) {
@@ -182,8 +180,6 @@ function ResponsiveUI(aWindow, aTab)
 
   this.tab.__responsiveUI = this;
 
-  this._telemetry.toolOpened("responsive");
-
   ResponsiveUIManager.emit("on", this.tab, this);
 }
 
@@ -242,7 +238,6 @@ ResponsiveUI.prototype = {
     this.stack.removeAttribute("responsivemode");
 
     delete this.tab.__responsiveUI;
-    this._telemetry.toolClosed("responsive");
     ResponsiveUIManager.emit("off", this.tab, this);
   },
 
diff --git a/browser/devtools/scratchpad/scratchpad.js b/browser/devtools/scratchpad/scratchpad.js
index 08a0bc2a5..816c7aa31 100644
--- a/browser/devtools/scratchpad/scratchpad.js
+++ b/browser/devtools/scratchpad/scratchpad.js
@@ -35,8 +35,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "VariablesView",
 XPCOMUtils.defineLazyModuleGetter(this, "devtools",
                                   "resource://gre/modules/devtools/Loader.jsm");
 
-let Telemetry = devtools.require("devtools/shared/telemetry");
-
 const SCRATCHPAD_CONTEXT_CONTENT = 1;
 const SCRATCHPAD_CONTEXT_BROWSER = 2;
 const SCRATCHPAD_L10N = "chrome://browser/locale/devtools/scratchpad.properties";
@@ -48,11 +46,6 @@ const BUTTON_POSITION_DONT_SAVE = 2;
 const BUTTON_POSITION_REVERT = 0;
 const VARIABLES_VIEW_URL = "chrome://browser/content/devtools/widgets/VariablesView.xul";
 
-// Because we have no constructor / destructor where we can log metrics we need
-// to do so here.
-let telemetry = new Telemetry();
-telemetry.toolOpened("scratchpad");
-
 /**
  * The scratchpad object handles the Scratchpad window functionality.
  */
@@ -1396,7 +1389,6 @@ var Scratchpad = {
       }
 
       if (shouldClose) {
-        telemetry.toolClosed("scratchpad");
         window.close();
       }
       if (aCallback) {
diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/browser/devtools/shared/DeveloperToolbar.jsm
index f5b19139c..d59c6f5e1 100644
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -51,8 +51,6 @@ XPCOMUtils.defineLazyGetter(this, "toolboxStrings", function () {
   return Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties");
 });
 
-let Telemetry = devtools.require("devtools/shared/telemetry");
-
 const converters = require("gcli/converters");
 
 /**
@@ -208,7 +206,6 @@ this.DeveloperToolbar = function DeveloperToolbar(aChromeWindow, aToolbarElement
   this._element.hidden = true;
   this._doc = this._element.ownerDocument;
 
-  this._telemetry = new Telemetry();
   this._lastState = NOTIFICATIONS.HIDE;
   this._pendingShowCallback = undefined;
   this._pendingHide = false;
@@ -341,8 +338,6 @@ DeveloperToolbar.prototype.show = function DT_show(aFocus, aCallback)
 
   Services.prefs.setBoolPref("devtools.toolbar.visible", true);
 
-  this._telemetry.toolOpened("developertoolbar");
-
   this._notify(NOTIFICATIONS.LOAD);
   this._pendingShowCallback = aCallback;
   this._pendingHide = false;
@@ -504,7 +499,6 @@ DeveloperToolbar.prototype.hide = function DT_hide()
   this._doc.getElementById("Tools:DevToolbar").setAttribute("checked", "false");
   this.destroy();
 
-  this._telemetry.toolClosed("developertoolbar");
   this._notify(NOTIFICATIONS.HIDE);
 };
 
diff --git a/browser/devtools/shared/telemetry.js b/browser/devtools/shared/telemetry.js
deleted file mode 100644
index 878826eda..000000000
--- a/browser/devtools/shared/telemetry.js
+++ /dev/null
@@ -1,253 +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/. */
-
-/**
- * Telemetry.
- *
- * To add metrics for a tool:
- *
- * 1. Create boolean, flag and exponential entries in
- *    toolkit/components/telemetry/Histograms.json. Each type is optional but it
- *    is best if all three can be included.
- *
- * 2. Add your chart entries to browser/devtools/shared/telemetry.js
- *    (Telemetry.prototype._histograms):
- *    mytoolname: {
- *      histogram: "DEVTOOLS_MYTOOLNAME_OPENED_BOOLEAN",
- *      userHistogram: "DEVTOOLS_MYTOOLNAME_OPENED_PER_USER_FLAG",
- *      timerHistogram: "DEVTOOLS_MYTOOLNAME_TIME_ACTIVE_SECONDS"
- *    },
- *
- * 3. Include this module at the top of your tool. Use:
- *      let Telemetry = require("devtools/shared/telemetry")
- *
- * 4. Create a telemetry instance in your tool's constructor:
- *      this._telemetry = new Telemetry();
- *
- * 5. When your tool is opened call:
- *      this._telemetry.toolOpened("mytoolname");
- *
- * 6. When your tool is closed call:
- *      this._telemetry.toolClosed("mytoolname");
- *
- * Note:
- * You can view telemetry stats for your local Firefox instance via
- * about:telemetry.
- *
- * You can view telemetry stats for large groups of Firefox users at
- * metrics.mozilla.com.
- */
-
-const TOOLS_OPENED_PREF = "devtools.telemetry.tools.opened.version";
-
-this.Telemetry = function() {
-  // Bind pretty much all functions so that callers do not need to.
-  this.toolOpened = this.toolOpened.bind(this);
-  this.toolClosed = this.toolClosed.bind(this);
-  this.log = this.log.bind(this);
-  this.logOncePerBrowserVersion = this.logOncePerBrowserVersion.bind(this);
-  this.destroy = this.destroy.bind(this);
-
-  this._timers = new Map();
-};
-
-module.exports = Telemetry;
-
-let {Cc, Ci, Cu} = require("chrome");
-let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
-
-Telemetry.prototype = {
-  _histograms: {
-    toolbox: {
-      timerHistogram: "DEVTOOLS_TOOLBOX_TIME_ACTIVE_SECONDS"
-    },
-    options: {
-      histogram: "DEVTOOLS_OPTIONS_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_OPTIONS_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_OPTIONS_TIME_ACTIVE_SECONDS"
-    },
-    webconsole: {
-      histogram: "DEVTOOLS_WEBCONSOLE_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_WEBCONSOLE_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_WEBCONSOLE_TIME_ACTIVE_SECONDS"
-    },
-    browserconsole: {
-      histogram: "DEVTOOLS_BROWSERCONSOLE_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_BROWSERCONSOLE_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_BROWSERCONSOLE_TIME_ACTIVE_SECONDS"
-    },
-    inspector: {
-      histogram: "DEVTOOLS_INSPECTOR_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_INSPECTOR_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_INSPECTOR_TIME_ACTIVE_SECONDS"
-    },
-    ruleview: {
-      histogram: "DEVTOOLS_RULEVIEW_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_RULEVIEW_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_RULEVIEW_TIME_ACTIVE_SECONDS"
-    },
-    computedview: {
-      histogram: "DEVTOOLS_COMPUTEDVIEW_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_COMPUTEDVIEW_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_COMPUTEDVIEW_TIME_ACTIVE_SECONDS"
-    },
-    layoutview: {
-      histogram: "DEVTOOLS_LAYOUTVIEW_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_LAYOUTVIEW_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_LAYOUTVIEW_TIME_ACTIVE_SECONDS"
-    },
-    fontinspector: {
-      histogram: "DEVTOOLS_FONTINSPECTOR_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_FONTINSPECTOR_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_FONTINSPECTOR_TIME_ACTIVE_SECONDS"
-    },
-    jsdebugger: {
-      histogram: "DEVTOOLS_JSDEBUGGER_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_JSDEBUGGER_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_JSDEBUGGER_TIME_ACTIVE_SECONDS"
-    },
-    jsbrowserdebugger: {
-      histogram: "DEVTOOLS_JSBROWSERDEBUGGER_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_JSBROWSERDEBUGGER_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_JSBROWSERDEBUGGER_TIME_ACTIVE_SECONDS"
-    },
-    styleeditor: {
-      histogram: "DEVTOOLS_STYLEEDITOR_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_STYLEEDITOR_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_STYLEEDITOR_TIME_ACTIVE_SECONDS"
-    },
-    netmonitor: {
-      histogram: "DEVTOOLS_NETMONITOR_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_NETMONITOR_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_NETMONITOR_TIME_ACTIVE_SECONDS"
-    },
-    tilt: {
-      histogram: "DEVTOOLS_TILT_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_TILT_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_TILT_TIME_ACTIVE_SECONDS"
-    },
-    paintflashing: {
-      histogram: "DEVTOOLS_PAINTFLASHING_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_PAINTFLASHING_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_PAINTFLASHING_TIME_ACTIVE_SECONDS"
-    },
-    scratchpad: {
-      histogram: "DEVTOOLS_SCRATCHPAD_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_SCRATCHPAD_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_SCRATCHPAD_TIME_ACTIVE_SECONDS"
-    },
-    responsive: {
-      histogram: "DEVTOOLS_RESPONSIVE_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_RESPONSIVE_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_RESPONSIVE_TIME_ACTIVE_SECONDS"
-    },
-    developertoolbar: {
-      histogram: "DEVTOOLS_DEVELOPERTOOLBAR_OPENED_BOOLEAN",
-      userHistogram: "DEVTOOLS_DEVELOPERTOOLBAR_OPENED_PER_USER_FLAG",
-      timerHistogram: "DEVTOOLS_DEVELOPERTOOLBAR_TIME_ACTIVE_SECONDS"
-    }
-  },
-
-  /**
-   * Add an entry to a histogram.
-   *
-   * @param  {String} id
-   *         Used to look up the relevant histogram ID and log true to that
-   *         histogram.
-   */
-  toolOpened: function(id) {
-    let charts = this._histograms[id];
-
-    if (!charts) {
-      dump('Warning: An attempt was made to open a tool with an id of "' + id +
-           '", which is not listed in Telemetry._histograms. ' +
-           "Location: telemetry.js/toolOpened()\n");
-      return;
-    }
-
-    if (charts.histogram) {
-      this.log(charts.histogram, true);
-    }
-    if (charts.userHistogram) {
-      this.logOncePerBrowserVersion(charts.userHistogram, true);
-    }
-    if (charts.timerHistogram) {
-      this._timers.set(charts.timerHistogram, new Date());
-    }
-  },
-
-  toolClosed: function(id) {
-    let charts = this._histograms[id];
-
-    if (!charts || !charts.timerHistogram) {
-      return;
-    }
-
-    let startTime = this._timers.get(charts.timerHistogram);
-
-    if (startTime) {
-      let time = (new Date() - startTime) / 1000;
-      this.log(charts.timerHistogram, time);
-      this._timers.delete(charts.timerHistogram);
-    }
-  },
-
-  /**
-   * Log a value to a histogram.
-   *
-   * @param  {String} histogramId
-   *         Histogram in which the data is to be stored.
-   * @param  value
-   *         Value to store.
-   */
-  log: function(histogramId, value) {
-    if (histogramId) {
-      let histogram;
-
-      try {
-        // Telemetry stub
-      } catch(e) {
-        dump("Warning: An attempt was made to write to the " + histogramId +
-             " histogram, which is not defined in Histograms.json\n");
-      }
-    }
-  },
-
-  /**
-   * Log info about usage once per browser version. This allows us to discover
-   * how many individual users are using our tools for each browser version.
-   *
-   * @param  {String} perUserHistogram
-   *         Histogram in which the data is to be stored.
-   */
-  logOncePerBrowserVersion: function(perUserHistogram, value) {
-    let currentVersion = appInfo.version;
-    let latest = Services.prefs.getCharPref(TOOLS_OPENED_PREF);
-    let latestObj = JSON.parse(latest);
-
-    let lastVersionHistogramUpdated = latestObj[perUserHistogram];
-
-    if (typeof lastVersionHistogramUpdated == "undefined" ||
-        lastVersionHistogramUpdated !== currentVersion) {
-      latestObj[perUserHistogram] = currentVersion;
-      latest = JSON.stringify(latestObj);
-      Services.prefs.setCharPref(TOOLS_OPENED_PREF, latest);
-      this.log(perUserHistogram, value);
-    }
-  },
-
-  destroy: function() {
-    for (let [histogram, time] of this._timers) {
-      time = (new Date() - time) / 1000;
-
-      this.log(histogram, time);
-      this._timers.delete(histogram);
-    }
-  }
-};
-
-XPCOMUtils.defineLazyGetter(this, "appInfo", function() {
-  return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
-});
diff --git a/browser/devtools/tilt/tilt.js b/browser/devtools/tilt/tilt.js
index bd41f0432..b0bdfe294 100644
--- a/browser/devtools/tilt/tilt.js
+++ b/browser/devtools/tilt/tilt.js
@@ -11,7 +11,6 @@ let {TiltVisualizer} = require("devtools/tilt/tilt-visualizer");
 let TiltGL = require("devtools/tilt/tilt-gl");
 let TiltUtils = require("devtools/tilt/tilt-utils");
 let EventEmitter = require("devtools/shared/event-emitter");
-let Telemetry = require("devtools/shared/telemetry");
 
 Cu.import("resource://gre/modules/Services.jsm");
 
@@ -95,8 +94,6 @@ function Tilt(aWindow)
   EventEmitter.decorate(this);
 
   this.setup();
-
-  this._telemetry = new Telemetry();
 }
 
 Tilt.prototype = {
@@ -118,10 +115,7 @@ Tilt.prototype = {
     // if the visualizer for the current tab is already open, destroy it now
     if (this.visualizers[id]) {
       this.destroy(id, true);
-      this._telemetry.toolClosed("tilt");
       return;
-    } else {
-      this._telemetry.toolOpened("tilt");
     }
 
     // create a visualizer instance for the current tab
diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index 9133495dc..74882670c 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -36,8 +36,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Promise",
 XPCOMUtils.defineLazyModuleGetter(this, "Heritage",
     "resource:///modules/devtools/ViewHelpers.jsm");
 
-let Telemetry = devtools.require("devtools/shared/telemetry");
-
 const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
 let l10n = new WebConsoleUtils.l10n(STRINGS_URI);
 
@@ -527,7 +525,6 @@ WebConsole.prototype = {
 function BrowserConsole()
 {
   WebConsole.apply(this, arguments);
-  this._telemetry = new Telemetry();
 }
 
 BrowserConsole.prototype = Heritage.extend(WebConsole.prototype,
@@ -565,8 +562,6 @@ BrowserConsole.prototype = Heritage.extend(WebConsole.prototype,
     // Make sure Ctrl-W closes the Browser Console window.
     window.document.getElementById("cmd_close").removeAttribute("disabled");
 
-    this._telemetry.toolOpened("browserconsole");
-
     this._bc_init = this.$init();
     return this._bc_init;
   },
@@ -585,8 +580,6 @@ BrowserConsole.prototype = Heritage.extend(WebConsole.prototype,
       return this._bc_destroyer.promise;
     }
 
-    this._telemetry.toolClosed("browserconsole");
-
     this._bc_destroyer = Promise.defer();
 
     let chromeWindow = this.chromeWindow;