Bug 763180 - NS_XRE_ENABLE_EXTENSION_MANAGER flag does nothing - remove it. r=glandium
authorMark Banner <standard8@mozilla.com>
Tue, 26 Aug 2014 08:50:07 +0100
changeset 201628 8ce721baa271f46794323530953e43ff920e1b46
parent 201627 7cb633f637af5de82058825127214f82081def40
child 201629 8530535e1ae054a8ddc59225d7f12a1a950ed37f
push id8376
push userryanvm@gmail.com
push dateTue, 26 Aug 2014 20:12:13 +0000
treeherderfx-team@2e9bbd03df15 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs763180
milestone34.0a1
Bug 763180 - NS_XRE_ENABLE_EXTENSION_MANAGER flag does nothing - remove it. r=glandium
b2g/confvars.sh
browser/confvars.sh
browser/metro/metroapp.ini.in
build/appini_header.py
build/application.ini
build/moz.build
configure.in
mobile/android/confvars.sh
toolkit/xre/CreateAppData.cpp
xpcom/build/nsXREAppData.h
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -43,17 +43,16 @@ if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
 MOZ_XULRUNNER=
 fi
 
 MOZ_MEDIA_NAVIGATOR=1
 
 MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f68613e61}
-MOZ_EXTENSION_MANAGER=1
 
 MOZ_TIME_MANAGER=1
 
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
 
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -46,17 +46,16 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=firefox-mozilla-central
 MOZ_PROFILE_MIGRATOR=1
-MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBAPP_RUNTIME=1
 MOZ_MEDIA_NAVIGATOR=1
 if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
   MOZ_FOLD_LIBS=1
 fi
 MOZ_WEBGL_CONFORMANT=1
 # Enable navigator.mozPay
--- a/browser/metro/metroapp.ini.in
+++ b/browser/metro/metroapp.ini.in
@@ -7,16 +7,15 @@ Version=@GRE_MILESTONE@
 BuildID=@GRE_BUILDID@
 ID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@
 
 [XRE]
-EnableExtensionManager=0
 EnableProfileMigrator=0
 
 [Crash Reporter]
 #if MOZILLA_OFFICIAL
 Enabled=1
 #endif
 ServerURL=https://crash-reports.mozilla.com/submit?id={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}&version=@GRE_MILESTONE@&buildid=@GRE_BUILDID@
--- a/build/appini_header.py
+++ b/build/appini_header.py
@@ -8,20 +8,16 @@
 import ConfigParser
 import sys
 
 def main(file):
     config = ConfigParser.RawConfigParser()
     config.read(file)
     flags = set()
     try:
-        if config.getint('XRE', 'EnableExtensionManager') == 1:
-            flags.add('NS_XRE_ENABLE_EXTENSION_MANAGER')
-    except: pass
-    try:
         if config.getint('XRE', 'EnableProfileMigrator') == 1:
             flags.add('NS_XRE_ENABLE_PROFILE_MIGRATOR')
     except: pass
     try:
         if config.getint('Crash Reporter', 'Enabled') == 1:
             flags.add('NS_XRE_ENABLE_CRASH_REPORTER')
     except: pass
     appdata = dict(("%s:%s" % (s, o), config.get(s, o)) for s in config.sections() for o in config.options(s))
--- a/build/application.ini
+++ b/build/application.ini
@@ -37,17 +37,14 @@ ID=@MOZ_APP_ID@
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@
 
 [XRE]
 #ifdef MOZ_PROFILE_MIGRATOR
 EnableProfileMigrator=1
 #endif
-#ifdef MOZ_EXTENSION_MANAGER
-EnableExtensionManager=1
-#endif
 
 #if MOZ_CRASHREPORTER
 [Crash Reporter]
 Enabled=1
 ServerURL=https://crash-reports.mozilla.com/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSION@&buildid=@APP_BUILDID@
 #endif
--- a/build/moz.build
+++ b/build/moz.build
@@ -35,16 +35,16 @@ if CONFIG['MOZ_APP_DISPLAYNAME'] != CONF
 
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 if CONFIG['MOZ_APP_PROFILE']:
     DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
 for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR',
-            'MOZ_EXTENSION_MANAGER', 'MOZ_APP_STATIC_INI'):
+            'MOZ_APP_STATIC_INI'):
     if CONFIG[var]:
         DEFINES[var] = True
 
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     PYTHON_UNIT_TESTS += [
         'compare-mozconfig/compare-mozconfigs-wrapper.py',
     ]
--- a/configure.in
+++ b/configure.in
@@ -8480,17 +8480,16 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE)
 # - MOZ_APP_VERSION: Defines the application version number.
 # - MOZ_APP_NAME: Used for e.g. the binary program file name. If not set,
 # defaults to a lowercase form of MOZ_APP_BASENAME.
 # - MOZ_APP_PROFILE: When set, used for application.ini's
 # "Profile" field, which controls profile location.
 # - MOZ_APP_ID: When set, used for application.ini's "ID" field, and
 # crash reporter server url.
 # - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
-# - MOZ_EXTENSION_MANAGER: When set, enabled extension manager.
 
 if test -z "$MOZ_APP_NAME"; then
    MOZ_APP_NAME=`echo $MOZ_APP_BASENAME | tr A-Z a-z`
 fi
 
 # For extensions and langpacks, we require a max version that is compatible
 # across security releases. MOZ_APP_MAXVERSION is our method for doing that.
 # 24.0a1 and 24.0a2 aren't affected
@@ -8513,17 +8512,16 @@ AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_BASENAME)
 AC_SUBST(MOZ_APP_VENDOR)
 AC_SUBST(MOZ_APP_PROFILE)
 AC_SUBST(MOZ_APP_ID)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
 AC_SUBST(MOZ_PROFILE_MIGRATOR)
-AC_SUBST(MOZ_EXTENSION_MANAGER)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_NAME, "$MOZ_APP_UA_NAME")
 AC_SUBST(MOZ_APP_UA_NAME)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
 AC_SUBST(MOZ_APP_VERSION)
 AC_SUBST(MOZ_APP_MAXVERSION)
 AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)
 AC_SUBST(MOZ_UA_OS_AGNOSTIC)
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -39,17 +39,16 @@ MOZ_SOCIAL=
 MOZ_ANDROID_HISTORY=1
 MOZ_DISABLE_EXPORT_JS=1
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
-MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 
 # Enable on-demand decompression
 MOZ_ENABLE_SZIP=1
 
 MOZ_FOLD_LIBS=1
 
 # Enable navigator.mozPay
--- a/toolkit/xre/CreateAppData.cpp
+++ b/toolkit/xre/CreateAppData.cpp
@@ -109,17 +109,16 @@ XRE_ParseAppData(nsIFile* aINIFile, nsXR
     { "App", "Copyright", &aAppData->copyright },
     { "App", "Profile",   &aAppData->profile },
     { nullptr }
   };
   ReadStrings(parser, strings);
 
   ReadFlag flags[] = {
     { "XRE", "EnableProfileMigrator", NS_XRE_ENABLE_PROFILE_MIGRATOR },
-    { "XRE", "EnableExtensionManager", NS_XRE_ENABLE_EXTENSION_MANAGER },
     { nullptr }
   };
   ReadFlags(parser, flags, &aAppData->flags);
 
   if (aAppData->size > offsetof(nsXREAppData, xreDirectory)) {
     ReadString strings2[] = {
       { "Gecko", "MinVersion", &aAppData->minVersion },
       { "Gecko", "MaxVersion", &aAppData->maxVersion },
--- a/xpcom/build/nsXREAppData.h
+++ b/xpcom/build/nsXREAppData.h
@@ -123,19 +123,13 @@ struct nsXREAppData
 
 /**
  * Indicates whether or not the profile migrator service may be
  * invoked at startup when creating a profile.
  */
 #define NS_XRE_ENABLE_PROFILE_MIGRATOR (1 << 1)
 
 /**
- * Indicates whether or not the extension manager service should be
- * initialized at startup.
- */
-#define NS_XRE_ENABLE_EXTENSION_MANAGER (1 << 2)
-
-/**
  * Indicates whether or not to use Breakpad crash reporting.
  */
 #define NS_XRE_ENABLE_CRASH_REPORTER (1 << 3)
 
 #endif // nsXREAppData_h