Backed out changeset af4327fd49cd (bug 1361661) for bustage in Teleme…

…tryProcessData.h. r=backout

CLOBBER

@@ -22,5 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1361661 - Update Telemetry build and headers.
-
+Bug 1340627 - clobber for Skia update

toolkit/components/telemetry/Processes.yaml

@@ -6,16 +6,12 @@
 # For now this is only used to inform the data pipeline about new processes, but will be used to
 # generate headers with C++ data later (enums, strings, ...).
 parent:
-  gecko_enum: GeckoProcessType_Default
   description: This is the main process. It is also known as the parent or chrome process.
 content:
-  gecko_enum: GeckoProcessType_Content
   description: This is for processes web content is rendered in.
 extension:
-  gecko_enum: GeckoProcessType_Content
   description: >
     This is the WebExtension process. It is a re-used content process, with the data submitted
     separately to avoid skewing other content process Telemetry.
 gpu:
-  gecko_enum: GeckoProcessType_GPU
   description: This is the compositor or GPU process.

toolkit/components/telemetry/moz.build

@@ -43,7 +43,6 @@ XPIDL_MODULE = 'telemetry'
 EXPORTS.mozilla += [
     '!TelemetryEventEnums.h',
     '!TelemetryHistogramEnums.h',
-    '!TelemetryProcessEnums.h',
     '!TelemetryScalarEnums.h',
     'ipc/TelemetryComms.h',
     'ipc/TelemetryIPC.h',
@@ -95,8 +94,6 @@ GENERATED_FILES = [
     'TelemetryEventEnums.h',
     'TelemetryHistogramData.inc',
     'TelemetryHistogramEnums.h',
-    'TelemetryProcessData.h',
-    'TelemetryProcessEnums.h',
     'TelemetryScalarData.h',
     'TelemetryScalarEnums.h',
 ]
@@ -142,18 +139,5 @@ event_enums = GENERATED_FILES['TelemetryEventEnums.h']
 event_enums.script = 'gen-event-enum.py'
 event_enums.inputs = event_files
 
-# Generate data from Processes.yaml
-processes_files = [
-    'Processes.yaml',
-]
-
-processes_enum = GENERATED_FILES['TelemetryProcessEnums.h']
-processes_enum.script = 'gen-process-enum.py'
-processes_enum.inputs = processes_files
-
-processes_data = GENERATED_FILES['TelemetryProcessData.h']
-processes_data.script = 'gen-process-data.py'
-processes_data.inputs = processes_files
-
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'Telemetry')

toolkit/components/telemetry/shared_telemetry_utils.py

@@ -8,7 +8,6 @@
 from __future__ import print_function
 
 import re
-import yaml
 
 # This is a list of flags that determine which process a measurement is allowed
 # to record from.
@@ -131,15 +130,3 @@ def add_expiration_postfix(expiration):
         return expiration + "a1"
 
     return expiration
-
-
-def load_yaml_file(filename):
-    """ Load a YAML file from disk, throw a ParserError on failure."""
-    try:
-        with open(filename, 'r') as f:
-            return yaml.safe_load(f)
-    except IOError, e:
-        raise ParserError('Error opening ' + filename + ': ' + e.message)
-    except ValueError, e:
-        raise ParserError('Error parsing processes in {}: {}'
-                          .format(filename, e.message))