Bug 1121966 - Change DISPLAY_SCALING_<OS> histograms to a single r=chutten

DISPLAY_SCALING

Replaced the os specific histograms by a single one.

MozReview-Commit-ID: FTwJmxh9sGu

--HG--
extra : rebase_source : 333719632ae2b658685249c51e7a8fbda20cfcde

browser/components/nsBrowserGlue.js

@@ -780,24 +780,10 @@ BrowserGlue.prototype = {
   },
 
   _firstWindowTelemetry(aWindow) {
-    let SCALING_PROBE_NAME = "";
-    switch (AppConstants.platform) {
-      case "win":
-        SCALING_PROBE_NAME = "DISPLAY_SCALING_MSWIN";
-        break;
-      case "macosx":
-        SCALING_PROBE_NAME = "DISPLAY_SCALING_OSX";
-        break;
-      case "linux":
-        SCALING_PROBE_NAME = "DISPLAY_SCALING_LINUX";
-        break;
-    }
-    if (SCALING_PROBE_NAME) {
-      let scaling = aWindow.devicePixelRatio * 100;
-      try {
-        Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling);
-      } catch (ex) {}
-    }
+    let scaling = aWindow.devicePixelRatio * 100;
+    try {
+      Services.telemetry.getHistogramById("DISPLAY_SCALING").add(scaling);
+    } catch (ex) {}
   },
 
   // the first browser window has finished initializing

toolkit/components/telemetry/Histograms.json

@@ -9444,29 +9444,14 @@
     "kind": "flag",
     "description": "If a master-password is enabled for this profile"
   },
-  "DISPLAY_SCALING_OSX" : {
+  "DISPLAY_SCALING" : {
     "expires_in_version": "never",
     "kind": "linear",
     "high": 500,
     "n_buckets": 100,
-    "description": "Scaling percentage for the display where the first window is opened (OS X only)",
-    "cpp_guard": "XP_MACOSX"
-  },
-  "DISPLAY_SCALING_MSWIN" : {
-    "expires_in_version": "never",
-    "kind": "linear",
-    "high": 500,
-    "n_buckets": 100,
-    "description": "Scaling percentage for the display where the first window is opened (MS Windows only)",
-    "cpp_guard": "XP_WIN"
-  },
-  "DISPLAY_SCALING_LINUX" : {
-    "expires_in_version": "never",
-    "kind": "linear",
-    "high": 500,
-    "n_buckets": 100,
-    "description": "Scaling percentage for the display where the first window is opened (Linux only)",
-    "cpp_guard": "XP_LINUX"
+    "bug_numbers": [1121966],
+    "alert_emails": ["dolske@mozilla.com"],
+    "description": "Scaling percentage for the display where the first window is opened"
   },
   "SOCIAL_SIDEBAR_STATE": {
     "expires_in_version": "never",

toolkit/components/telemetry/histogram-whitelists.json

@@ -205,9 +205,6 @@
     "DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT",
-    "DISPLAY_SCALING_LINUX",
-    "DISPLAY_SCALING_MSWIN",
-    "DISPLAY_SCALING_OSX",
     "DNS_BLACKLIST_COUNT",
     "DNS_CLEANUP_AGE",
     "DNS_FAILED_LOOKUP_TIME",
@@ -881,9 +878,6 @@
     "DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT",
-    "DISPLAY_SCALING_LINUX",
-    "DISPLAY_SCALING_MSWIN",
-    "DISPLAY_SCALING_OSX",
     "DNS_BLACKLIST_COUNT",
     "DNS_CLEANUP_AGE",
     "DNS_FAILED_LOOKUP_TIME",