Bug 1153657 - Performance Monitoring is not ready to ride the trains. r=yoric

b2g/installer/package-manifest.in

@@ -326,7 +326,9 @@
 @RESPATH@/components/toolkit_finalizationwitness.xpt
 @RESPATH@/components/toolkit_formautofill.xpt
 @RESPATH@/components/toolkit_osfile.xpt
+#ifdef NIGHTLY_BUILD
 @RESPATH@/components/toolkit_perfmonitoring.xpt
+#endif
 @RESPATH@/components/toolkit_xulstore.xpt
 @RESPATH@/components/toolkitprofile.xpt
 #ifdef MOZ_ENABLE_XREMOTE

browser/base/content/test/social/browser_addons.js

@@ -1,8 +1,5 @@
-
-
 let AddonManager = Cu.import("resource://gre/modules/AddonManager.jsm", {}).AddonManager;
 let SocialService = Cu.import("resource://gre/modules/SocialService.jsm", {}).SocialService;
-let AddonWatcher = Cu.import("resource://gre/modules/AddonWatcher.jsm", {}).AddonWatcher;
 
 const ADDON_TYPE_SERVICE     = "service";
 const ID_SUFFIX              = "@services.mozilla.org";

browser/components/nsBrowserGlue.js

@@ -747,7 +747,9 @@ BrowserGlue.prototype = {
 
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
 
+#ifdef NIGHTLY_BUILD
     AddonWatcher.init(this._notifySlowAddon);
+#endif
   },
 
   _checkForOldBuildUpdates: function () {
@@ -1006,7 +1008,9 @@ BrowserGlue.prototype = {
 #endif
     webrtcUI.uninit();
     FormValidationHandler.uninit();
+#ifdef NIGHTLY_BUILD
     AddonWatcher.uninit();
+#endif
   },
 
   _initServiceDiscovery: function () {

browser/installer/package-manifest.in

@@ -327,7 +327,9 @@
 @RESPATH@/components/toolkit_finalizationwitness.xpt
 @RESPATH@/components/toolkit_formautofill.xpt
 @RESPATH@/components/toolkit_osfile.xpt
+#ifdef NIGHTLY_BUILD
 @RESPATH@/components/toolkit_perfmonitoring.xpt
+#endif
 @RESPATH@/components/toolkit_xulstore.xpt
 @RESPATH@/components/toolkitprofile.xpt
 #ifdef MOZ_ENABLE_XREMOTE

mobile/android/installer/package-manifest.in

@@ -253,7 +253,9 @@
 @BINPATH@/components/toolkit_finalizationwitness.xpt
 @BINPATH@/components/toolkit_formautofill.xpt
 @BINPATH@/components/toolkit_osfile.xpt
+#ifdef NIGHTLY_BUILD
 @BINPATH@/components/toolkit_perfmonitoring.xpt
+#endif
 @BINPATH@/components/toolkit_xulstore.xpt
 @BINPATH@/components/toolkitprofile.xpt
 #ifdef MOZ_ENABLE_XREMOTE

toolkit/components/build/moz.build

@@ -21,7 +21,6 @@ LOCAL_INCLUDES += [
     '../feeds',
     '../find',
     '../jsdownloads/src',
-    '../perfmonitoring',
     '../protobuf',
     '../startup',
     '../statusfilter',
@@ -34,4 +33,9 @@ if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']:
         '../parentalcontrols',
     ]
 
+if CONFIG['NIGHTLY_BUILD']:
+    LOCAL_INCLUDES += [
+        '../perfmonitoring',
+    ]
+
 FAIL_ON_WARNINGS = True

toolkit/components/build/nsToolkitCompsModule.cpp

@@ -51,7 +51,13 @@
 #include "nsTerminator.h"
 #endif
 
+#if defined(NIGHTLY_BUILD)
+#define MOZ_HAS_PERFSTATS
+#endif // defined(NIGHTLY_BUILD)
+
+#if defined(MOZ_HAS_PERFSTATS)
 #include "nsPerformanceStats.h"
+#endif // defined (MOZ_HAS_PERFSTATS)
 
 using namespace mozilla;
 
@@ -59,7 +65,9 @@ using namespace mozilla;
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppStartup, Init)
 
+#if defined(MOZ_HAS_PERFSTATS)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPerformanceStatsService)
+#endif // defined (MOZ_HAS_PERFSTATS)
 
 #if defined(MOZ_HAS_TERMINATOR)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTerminator)
@@ -119,7 +127,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NativeFileWatcherService, Init)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(AddonPathService, AddonPathService::GetInstance)
 
 NS_DEFINE_NAMED_CID(NS_TOOLKIT_APPSTARTUP_CID);
+#if defined(MOZ_HAS_PERFSTATS)
 NS_DEFINE_NAMED_CID(NS_TOOLKIT_PERFORMANCESTATSSERVICE_CID);
+#endif // defined (MOZ_HAS_PERFSTATS)
+
 #if defined(MOZ_HAS_TERMINATOR)
 NS_DEFINE_NAMED_CID(NS_TOOLKIT_TERMINATOR_CID);
 #endif
@@ -154,7 +165,9 @@ static const Module::CIDEntry kToolkitCIDs[] = {
 #if defined(MOZ_HAS_TERMINATOR)
   { &kNS_TOOLKIT_TERMINATOR_CID, false, nullptr, nsTerminatorConstructor },
 #endif
+#if defined(MOZ_HAS_PERFSTATS)
   { &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID, false, nullptr, nsPerformanceStatsServiceConstructor },
+#endif // defined (MOZ_HAS_PERFSTATS)
   { &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor },
   { &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor },
 #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -188,7 +201,9 @@ static const Module::ContractIDEntry kToolkitContracts[] = {
 #if defined(MOZ_HAS_TERMINATOR)
   { NS_TOOLKIT_TERMINATOR_CONTRACTID, &kNS_TOOLKIT_TERMINATOR_CID },
 #endif
+#if defined(MOZ_HAS_PERFSTATS)
   { NS_TOOLKIT_PERFORMANCESTATSSERVICE_CONTRACTID, &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID },
+#endif // defined (MOZ_HAS_PERFSTATS)
   { NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID },
   { NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
 #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)

toolkit/components/moz.build

@@ -11,7 +11,6 @@ if CONFIG['MOZ_ENABLE_XREMOTE']:
 DIRS += [
     'aboutcache',
     'aboutmemory',
-    'aboutperformance',
     'addoncompat',
     'alerts',
     'apppicker',
@@ -36,7 +35,6 @@ DIRS += [
     'parentalcontrols',
     'passwordmgr',
     'perf',
-    'perfmonitoring',
     'places',
     'processsingleton',
     'promiseworker',
@@ -92,6 +90,12 @@ if CONFIG['MOZ_CAPTIVEDETECT']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk" and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['terminator']
 
+if CONFIG['NIGHTLY_BUILD']: # Bug 1136927 - Performance Monitoring is not ready for prime-time yet
+    DIRS += [
+      'aboutperformance',
+      'perfmonitoring',
+    ]
+
 DIRS += ['build']
 
 EXTRA_COMPONENTS += [