Bug 1179902 - In Firefox 40, revert the effect of bug 1159737 to allow binary XPCOM in extension for one more release, r=backout a=sledru
authorBenjamin Smedberg <benjamin@smedbergs.us>
Thu, 09 Jul 2015 17:50:32 -0400
changeset 275330 73a8176437a06cace6a31f186bb41825aac0d1b8
parent 275329 6141fafa90698b22dac98b93384441dfe664735d
child 275331 3448b05774a97e4d06ef0cce9bf89a785bda1573
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, sledru
bugs1179902, 1159737
milestone40.0
Bug 1179902 - In Firefox 40, revert the effect of bug 1159737 to allow binary XPCOM in extension for one more release, r=backout a=sledru
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -634,17 +634,17 @@ nsXREDirProvider::LoadExtensionBundleDir
 
       nsINIParser parser;
       nsresult rv = parser.Init(extensionsINILF);
       if (NS_FAILED(rv))
         return;
 
       RegisterExtensionInterpositions(parser);
       LoadExtensionDirectories(parser, "ExtensionDirs", mExtensionDirectories,
-                               NS_EXTENSION_LOCATION);
+                               NS_APP_LOCATION);
       LoadExtensionDirectories(parser, "ThemeDirs", mThemeDirectories,
                                NS_SKIN_LOCATION);
 #ifdef MOZ_BUILD_APP_IS_BROWSER
     } else {
       // In safe mode, still load the default theme directory:
       nsCOMPtr<nsIFile> themeManifest;
       mXULAppDir->Clone(getter_AddRefs(themeManifest));
       themeManifest->AppendNative(NS_LITERAL_CSTRING("extensions"));