From b1d0b9f9dc8b77a8cc912d8ec531419a13e08037 Mon Sep 17 00:00:00 2001
From: Alessio Placitelli <alessio.placitelli@gmail.com>
Date: Thu, 21 Jan 2016 07:59:00 +0100
Subject: [PATCH] Bug 1234518 - Clean MOZ_SERVICES_HEALTHREPORT and and
 MOZ_SERVICES_METRICS. r=gfritzsche

---
 browser/base/content/baseMenuOverlay.xul               | 2 +-
 browser/components/nsBrowserGlue.js                    | 4 ++--
 browser/components/preferences/in-content/advanced.js  | 6 +++---
 browser/components/preferences/in-content/advanced.xul | 4 +---
 configure.in                                           | 6 ------
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul
index 40207123b9a3..da74ca077c0c 100644
--- a/browser/base/content/baseMenuOverlay.xul
+++ b/browser/base/content/baseMenuOverlay.xul
@@ -61,7 +61,7 @@
                   onclick="checkForMiddleClick(this, event);"
                   label="&helpKeyboardShortcuts.label;"
                   accesskey="&helpKeyboardShortcuts.accesskey;"/>
-#ifdef MOZ_SERVICES_HEALTHREPORT
+#ifdef MOZ_TELEMETRY_REPORTING
         <menuitem id="healthReport"
                   label="&healthReport2.label;"
                   accesskey="&healthReport2.accesskey;"
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 515f04d83042..371d749e1f20 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -535,7 +535,7 @@ BrowserGlue.prototype = {
     this._isPlacesShutdownObserver = true;
     os.addObserver(this, "handle-xul-text-link", false);
     os.addObserver(this, "profile-before-change", false);
-    if (AppConstants.MOZ_SERVICES_HEALTHREPORT) {
+    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
       os.addObserver(this, "keyword-search", false);
     }
     os.addObserver(this, "browser-search-engine-modified", false);
@@ -594,7 +594,7 @@ BrowserGlue.prototype = {
       os.removeObserver(this, "places-shutdown");
     os.removeObserver(this, "handle-xul-text-link");
     os.removeObserver(this, "profile-before-change");
-    if (AppConstants.MOZ_SERVICES_HEALTHREPORT) {
+    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
       os.removeObserver(this, "keyword-search");
     }
     os.removeObserver(this, "browser-search-engine-modified");
diff --git a/browser/components/preferences/in-content/advanced.js b/browser/components/preferences/in-content/advanced.js
index 9affcb79da0f..cfa42dc2dec0 100644
--- a/browser/components/preferences/in-content/advanced.js
+++ b/browser/components/preferences/in-content/advanced.js
@@ -44,7 +44,7 @@ var gAdvancedPane = {
     this.initSubmitCrashes();
 #endif
     this.initTelemetry();
-#ifdef MOZ_SERVICES_HEALTHREPORT
+#ifdef MOZ_TELEMETRY_REPORTING
     this.initSubmitHealthReport();
 #endif
     this.updateOnScreenKeyboardVisibility();
@@ -56,7 +56,7 @@ var gAdvancedPane = {
                      gAdvancedPane.updateHardwareAcceleration);
     setEventListener("advancedPrefs", "select",
                      gAdvancedPane.tabSelectionChanged);
-#ifdef MOZ_SERVICES_HEALTHREPORT
+#ifdef MOZ_TELEMETRY_REPORTING
     setEventListener("submitHealthReportBox", "command",
                      gAdvancedPane.updateSubmitHealthReport);
 #endif
@@ -289,7 +289,7 @@ var gAdvancedPane = {
 #endif
   },
 
-#ifdef MOZ_SERVICES_HEALTHREPORT
+#ifdef MOZ_TELEMETRY_REPORTING
   /**
    * Initialize the health report service reference and checkbox.
    */
diff --git a/browser/components/preferences/in-content/advanced.xul b/browser/components/preferences/in-content/advanced.xul
index ce3640d67027..3db14d216487 100644
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -199,7 +199,7 @@
 #ifdef MOZ_DATA_REPORTING
     <!-- Data Choices -->
     <tabpanel id="dataChoicesPanel" orient="vertical">
-#ifdef MOZ_SERVICES_HEALTHREPORT
+#ifdef MOZ_TELEMETRY_REPORTING
       <groupbox>
         <caption>
           <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
@@ -212,7 +212,6 @@
             <label id="FHRLearnMore"
                    class="text-link">&healthReportLearnMore.label;</label>
           </hbox>
-#ifdef MOZ_TELEMETRY_REPORTING
           <hbox class="indent">
             <groupbox flex="1">
               <caption>
@@ -228,7 +227,6 @@
               </hbox>
             </groupbox>
           </hbox>
-#endif
         </vbox>
       </groupbox>
 #endif
diff --git a/configure.in b/configure.in
index fd4d530f5b7b..ee410c741758 100644
--- a/configure.in
+++ b/configure.in
@@ -8425,12 +8425,6 @@ if test -n "$MOZ_SERVICES_HEALTHREPORT"; then
   AC_DEFINE(MOZ_SERVICES_HEALTHREPORT)
 fi
 
-dnl Build Services metrics component
-AC_SUBST(MOZ_SERVICES_METRICS)
-if test -n "$MOZ_SERVICES_METRICS"; then
-  AC_DEFINE(MOZ_SERVICES_METRICS)
-fi
-
 dnl Build Notifications if required
 AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
 if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then