From 7ead039c6bd410f0c34d6f925df25c627831a359 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Tue, 23 May 2017 13:48:35 +0700
Subject: [PATCH] Bug 1361661 - Part 4 - Update TelemetrySession to the new
 process names in the snapshot. r=dexter

We now consistently use the same process names throughout Telemetry, except for histograms.
---
 .../components/telemetry/TelemetrySession.jsm | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetrySession.jsm b/toolkit/components/telemetry/TelemetrySession.jsm
index b2e713ee61f1..54cc6ff26ea3 100644
--- a/toolkit/components/telemetry/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/TelemetrySession.jsm
@@ -45,13 +45,8 @@ const HISTOGRAM_SUFFIXES = {
   PARENT: "",
   CONTENT: "#content",
   GPU: "#gpu",
-}
-
-const INTERNAL_PROCESSES_NAMES = {
-  PARENT: "default",
-  CONTENT: "tab",
-  GPU: "gpu",
-}
+  EXTENSION: "#extension",
+};
 
 const ENVIRONMENT_CHANGE_LISTENER = "TelemetrySession::onEnvironmentChange";
 
@@ -1307,30 +1302,37 @@ var Impl = {
     payloadObj.keyedHistograms = keyedHistograms[HISTOGRAM_SUFFIXES.PARENT] || {};
     payloadObj.processes = {
       parent: {
-        scalars: scalars[INTERNAL_PROCESSES_NAMES.PARENT] || {},
-        keyedScalars: keyedScalars[INTERNAL_PROCESSES_NAMES.PARENT] || {},
-        events: events[INTERNAL_PROCESSES_NAMES.PARENT] || [],
+        scalars: scalars["parent"] || {},
+        keyedScalars: keyedScalars["parent"] || {},
+        events: events["parent"] || [],
       },
       content: {
-        scalars: scalars[INTERNAL_PROCESSES_NAMES.CONTENT],
-        keyedScalars: keyedScalars[INTERNAL_PROCESSES_NAMES.CONTENT],
+        scalars: scalars["content"],
+        keyedScalars: keyedScalars["content"],
         histograms: histograms[HISTOGRAM_SUFFIXES.CONTENT],
         keyedHistograms: keyedHistograms[HISTOGRAM_SUFFIXES.CONTENT],
-        events: events[INTERNAL_PROCESSES_NAMES.CONTENT] || [],
+        events: events["content"] || [],
+      },
+      extension: {
+        scalars: scalars["extension"],
+        keyedScalars: keyedScalars["extension"],
+        histograms: histograms[HISTOGRAM_SUFFIXES.EXTENSION],
+        keyedHistograms: keyedHistograms[HISTOGRAM_SUFFIXES.EXTENSION],
+        events: events["extension"] || [],
       },
     };
 
     // Only include the GPU process if we've accumulated data for it.
     if (HISTOGRAM_SUFFIXES.GPU in histograms ||
         HISTOGRAM_SUFFIXES.GPU in keyedHistograms ||
-        INTERNAL_PROCESSES_NAMES.GPU in scalars ||
-        INTERNAL_PROCESSES_NAMES.GPU in keyedScalars) {
+        "gpu" in scalars ||
+        "gpu" in keyedScalars) {
       payloadObj.processes.gpu = {
-        scalars: scalars[INTERNAL_PROCESSES_NAMES.GPU],
-        keyedScalars: keyedScalars[INTERNAL_PROCESSES_NAMES.GPU],
+        scalars: scalars["gpu"],
+        keyedScalars: keyedScalars["gpu"],
         histograms: histograms[HISTOGRAM_SUFFIXES.GPU],
         keyedHistograms: keyedHistograms[HISTOGRAM_SUFFIXES.GPU],
-        events: events[INTERNAL_PROCESSES_NAMES.GPU] || [],
+        events: events["gpu"] || [],
       };
     }