Bug 755724 - Move browser application in a subdirectory. r=jimm
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 11 Feb 2013 14:10:16 +0100
changeset 131346 784b9beebe90f5e0219a66c8a58a222fdd517c58
parent 131345 2d9c75b462f881a32f6faa65630fdfd2bd23cbed
child 131347 96c341954032ad826ef7aff5b250c49836bfc826
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs755724
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 755724 - Move browser application in a subdirectory. r=jimm
CLOBBER
browser/app-rules.mk
browser/app/Makefile.in
browser/app/nsBrowserApp.cpp
browser/components/dirprovider/tests/unit/xpcshell.ini
browser/components/downloads/test/unit/xpcshell.ini
browser/components/feeds/test/unit/xpcshell.ini
browser/components/migration/tests/unit/xpcshell.ini
browser/components/places/tests/unit/xpcshell.ini
browser/components/sessionstore/test/unit/xpcshell.ini
browser/components/shell/test/unit/xpcshell.ini
browser/defs.mk
browser/devtools/shared/test/unit/xpcshell.ini
browser/installer/package-manifest.in
browser/locales/jar.mn
browser/modules/test/unit/xpcshell.ini
services/common/tests/unit/xpcshell.ini
services/crypto/component/tests/unit/xpcshell.ini
services/crypto/tests/unit/xpcshell.ini
services/sync/tests/unit/xpcshell.ini
toolkit/components/downloads/test/unit/xpcshell.ini
toolkit/components/places/tests/autocomplete/xpcshell.ini
toolkit/components/places/tests/unit/xpcshell.ini
toolkit/components/search/tests/xpcshell/xpcshell.ini
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 793928 - Move the promise library to a new location
+Bug 755724 - Move browser application in a subdirectory
new file mode 100644
--- /dev/null
+++ b/browser/app-rules.mk
@@ -0,0 +1,1 @@
+PURGECACHES_DIRS = $(DIST)/bin/browser
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -97,16 +97,18 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
 RESFILE=splashos2.res
 RCFLAGS += -DMOZ_PHOENIX
 RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
 endif
 
+PROGRAMS_DEST = $(DIST)/bin
+
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT) #{
 #
 # Control the default heap size.
 # This is the heap returned by GetProcessHeap().
 # As we use the CRT heap, the default size is too large and wastes VM.
 #
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -173,16 +173,17 @@ static int do_main(int argc, char* argv[
   nsCOMPtr<nsIFile> exeFile;
   rv = mozilla::BinaryPath::GetFile(argv[0], getter_AddRefs(exeFile));
   if (NS_FAILED(rv)) {
     Output("Couldn't find the application directory.\n");
     return 255;
   }
   nsCOMPtr<nsIFile> appDir;
   exeFile->GetParent(getter_AddRefs(appDir));
+  appDir->Append(NS_LITERAL_STRING("browser"));
 
   SetStrongPtr(appData.directory, static_cast<nsIFile*>(appDir.get()));
   // xreDirectory already has a refcount from NS_NewLocalFile
   appData.xreDirectory = xreDirectory;
   return XRE_main(argc, argv, &appData, 0);
 }
 
 /* Local implementation of PR_Now, since the executable can't depend on NSPR */
--- a/browser/components/dirprovider/tests/unit/xpcshell.ini
+++ b/browser/components/dirprovider/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head_dirprovider.js
 tail = 
+firefox-appdir = browser
 
 [test_bookmark_pref.js]
 [test_keys.js]
--- a/browser/components/downloads/test/unit/xpcshell.ini
+++ b/browser/components/downloads/test/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head.js
 tail =
+firefox-appdir = browser
 
 [test_DownloadsCommon.js]
--- a/browser/components/feeds/test/unit/xpcshell.ini
+++ b/browser/components/feeds/test/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head_feeds.js
 tail = 
+firefox-appdir = browser
 
 [test_355473.js]
 [test_758990.js]
--- a/browser/components/migration/tests/unit/xpcshell.ini
+++ b/browser/components/migration/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head_migration.js
 tail =
+firefox-appdir = browser
 
 [test_IE_bookmarks.js]
 skip-if = os != "win"
--- a/browser/components/places/tests/unit/xpcshell.ini
+++ b/browser/components/places/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail = 
+firefox-appdir = browser
 
 [test_421483.js]
 [test_browserGlue_corrupt.js]
 [test_browserGlue_corrupt_nobackup.js]
 [test_browserGlue_corrupt_nobackup_default.js]
 [test_browserGlue_distribution.js]
 [test_browserGlue_migrate.js]
 [test_browserGlue_prefs.js]
--- a/browser/components/sessionstore/test/unit/xpcshell.ini
+++ b/browser/components/sessionstore/test/unit/xpcshell.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
 head = head.js
 tail =
+firefox-appdir = browser
 
 [test_startup_nosession_sync.js]
 [test_startup_nosession_async.js]
 [test_startup_session_sync.js]
-[test_startup_session_async.js]
\ No newline at end of file
+[test_startup_session_async.js]
--- a/browser/components/shell/test/unit/xpcshell.ini
+++ b/browser/components/shell/test/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
+firefox-appdir = browser
 
 [test_421977.js]
new file mode 100644
--- /dev/null
+++ b/browser/defs.mk
@@ -0,0 +1,2 @@
+DIST_SUBDIR=browser
+XPI_ROOT_APPID=$(MOZ_APP_ID)
--- a/browser/devtools/shared/test/unit/xpcshell.ini
+++ b/browser/devtools/shared/test/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head =
 tail =
+firefox-appdir = browser
 
 [test_undoStack.js]
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -25,26 +25,28 @@
 @APPNAME@/Contents/PkgInfo
 @APPNAME@/Contents/Resources/
 #ifdef MOZ_SIGNING
 @APPNAME@/Contents/_CodeSignature/CodeResources
 #endif
 #endif
 
 [@AB_CD@]
+@BINPATH@/browser/chrome/@AB_CD@@JAREXT@
+@BINPATH@/browser/chrome/@AB_CD@.manifest
 @BINPATH@/chrome/@AB_CD@@JAREXT@
 @BINPATH@/chrome/@AB_CD@.manifest
-@BINPATH@/defaults/profile/bookmarks.html
-@BINPATH@/defaults/profile/chrome/*
-@BINPATH@/defaults/profile/localstore.rdf
-@BINPATH@/defaults/profile/mimeTypes.rdf
+@BINPATH@/browser/defaults/profile/bookmarks.html
+@BINPATH@/browser/defaults/profile/chrome/*
+@BINPATH@/browser/defaults/profile/localstore.rdf
+@BINPATH@/browser/defaults/profile/mimeTypes.rdf
 @BINPATH@/dictionaries/*
 @BINPATH@/hyphenation/*
-@BINPATH@/@PREF_DIR@/firefox-l10n.js
-@BINPATH@/searchplugins/*
+@BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
+@BINPATH@/browser/searchplugins/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 #endif
 
@@ -118,40 +120,40 @@
 @BINPATH@/platform.ini
 #ifndef XP_OS2
 #ifndef MOZ_NATIVE_SQLITE
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #else
 @BINPATH@/mozsqlt3@DLL_SUFFIX@
 #endif
-@BINPATH@/blocklist.xml
+@BINPATH@/browser/blocklist.xml
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 @BINPATH@/run-mozilla.sh
 @BINPATH@/mozilla-xremote-client
 #endif
 #endif
 
 ; [Components]
-@BINPATH@/components/components.manifest
+@BINPATH@/browser/components/components.manifest
 @BINPATH@/components/alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 @BINPATH@/components/accessibility-msaa.xpt
 #endif
 @BINPATH@/components/accessibility.xpt
 #endif
 @BINPATH@/components/appshell.xpt
 @BINPATH@/components/appstartup.xpt
 @BINPATH@/components/autocomplete.xpt
 @BINPATH@/components/autoconfig.xpt
-@BINPATH@/components/browsercompsbase.xpt
-@BINPATH@/components/browser-feeds.xpt
+@BINPATH@/browser/components/browsercompsbase.xpt
+@BINPATH@/browser/components/browser-feeds.xpt
 @BINPATH@/components/caps.xpt
 @BINPATH@/components/chrome.xpt
 @BINPATH@/components/commandhandler.xpt
 @BINPATH@/components/commandlines.xpt
 @BINPATH@/components/composer.xpt
 @BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
 @BINPATH@/components/content_canvas.xpt
@@ -218,17 +220,17 @@
 @BINPATH@/components/exthandler.xpt
 @BINPATH@/components/exthelper.xpt
 @BINPATH@/components/fastfind.xpt
 @BINPATH@/components/feeds.xpt
 #ifdef MOZ_GTK2
 @BINPATH@/components/filepicker.xpt
 #endif
 @BINPATH@/components/find.xpt
-@BINPATH@/components/fuel.xpt
+@BINPATH@/browser/components/fuel.xpt
 @BINPATH@/components/gfx.xpt
 @BINPATH@/components/html5.xpt
 @BINPATH@/components/htmlparser.xpt
 @BINPATH@/components/identity.xpt
 @BINPATH@/components/imglib2.xpt
 @BINPATH@/components/imgicon.xpt
 @BINPATH@/components/inspector.xpt
 @BINPATH@/components/intl.xpt
@@ -242,17 +244,17 @@
 @BINPATH@/components/layout_forms.xpt
 #ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
 #endif
 @BINPATH@/components/layout_xul_tree.xpt
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/lwbrk.xpt
-@BINPATH@/components/migration.xpt
+@BINPATH@/browser/components/migration.xpt
 @BINPATH@/components/mimetype.xpt
 @BINPATH@/components/mozfind.xpt
 @BINPATH@/components/necko_about.xpt
 @BINPATH@/components/necko_cache.xpt
 @BINPATH@/components/necko_cookie.xpt
 @BINPATH@/components/necko_dns.xpt
 @BINPATH@/components/necko_file.xpt
 @BINPATH@/components/necko_ftp.xpt
@@ -277,22 +279,22 @@
 @BINPATH@/components/prefetch.xpt
 @BINPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
 @BINPATH@/components/profiler.xpt
 #endif
 @BINPATH@/components/rdf.xpt
 @BINPATH@/components/satchel.xpt
 @BINPATH@/components/saxparser.xpt
-@BINPATH@/components/sessionstore.xpt
+@BINPATH@/browser/components/sessionstore.xpt
 @BINPATH@/components/services-crypto-component.xpt
 #ifdef MOZ_SERVICES_CAPTIVEDETECT
 @BINPATH@/components/services-captivedetect.xpt
 #endif
-@BINPATH@/components/shellservice.xpt
+@BINPATH@/browser/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/spellchecker.xpt
 @BINPATH@/components/storage.xpt
 @BINPATH@/components/toolkitprofile.xpt
 #ifdef MOZ_ENABLE_XREMOTE
 @BINPATH@/components/toolkitremote.xpt
 #endif
 @BINPATH@/components/txtsvc.xpt
@@ -327,34 +329,34 @@
 
 ; JavaScript components
 @BINPATH@/components/ConsoleAPI.manifest
 @BINPATH@/components/ConsoleAPI.js
 @BINPATH@/components/BrowserElementParent.manifest
 @BINPATH@/components/BrowserElementParent.js
 @BINPATH@/components/FeedProcessor.manifest
 @BINPATH@/components/FeedProcessor.js
-@BINPATH@/components/BrowserFeeds.manifest
-@BINPATH@/components/FeedConverter.js
-@BINPATH@/components/FeedWriter.js
-@BINPATH@/components/fuelApplication.manifest
-@BINPATH@/components/fuelApplication.js
-@BINPATH@/components/WebContentConverter.js
-@BINPATH@/components/BrowserComponents.manifest
-@BINPATH@/components/nsBrowserContentHandler.js
-@BINPATH@/components/nsBrowserGlue.js
-@BINPATH@/components/nsSetDefaultBrowser.manifest
-@BINPATH@/components/nsSetDefaultBrowser.js
-@BINPATH@/components/BrowserDownloads.manifest
-@BINPATH@/components/DownloadsStartup.js
-@BINPATH@/components/DownloadsUI.js
-@BINPATH@/components/BrowserPlaces.manifest
-@BINPATH@/components/BrowserPageThumbs.manifest
-@BINPATH@/components/nsPrivateBrowsingServiceObsolete.manifest
-@BINPATH@/components/nsPrivateBrowsingServiceObsolete.js
+@BINPATH@/browser/components/BrowserFeeds.manifest
+@BINPATH@/browser/components/FeedConverter.js
+@BINPATH@/browser/components/FeedWriter.js
+@BINPATH@/browser/components/fuelApplication.manifest
+@BINPATH@/browser/components/fuelApplication.js
+@BINPATH@/browser/components/WebContentConverter.js
+@BINPATH@/browser/components/BrowserComponents.manifest
+@BINPATH@/browser/components/nsBrowserContentHandler.js
+@BINPATH@/browser/components/nsBrowserGlue.js
+@BINPATH@/browser/components/nsSetDefaultBrowser.manifest
+@BINPATH@/browser/components/nsSetDefaultBrowser.js
+@BINPATH@/browser/components/BrowserDownloads.manifest
+@BINPATH@/browser/components/DownloadsStartup.js
+@BINPATH@/browser/components/DownloadsUI.js
+@BINPATH@/browser/components/BrowserPlaces.manifest
+@BINPATH@/browser/components/BrowserPageThumbs.manifest
+@BINPATH@/browser/components/nsPrivateBrowsingServiceObsolete.manifest
+@BINPATH@/browser/components/nsPrivateBrowsingServiceObsolete.js
 @BINPATH@/components/SiteSpecificUserAgent.js
 @BINPATH@/components/SiteSpecificUserAgent.manifest
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/nsSearchService.js
 @BINPATH@/components/nsSearchSuggestions.js
 @BINPATH@/components/passwordmgr.manifest
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
@@ -371,53 +373,53 @@
 @BINPATH@/components/nsHelperAppDlg.manifest
 @BINPATH@/components/nsHelperAppDlg.js
 @BINPATH@/components/nsDownloadManagerUI.manifest
 @BINPATH@/components/nsDownloadManagerUI.js
 @BINPATH@/components/NetworkGeolocationProvider.manifest
 @BINPATH@/components/NetworkGeolocationProvider.js
 @BINPATH@/components/GPSDGeolocationProvider.manifest
 @BINPATH@/components/GPSDGeolocationProvider.js
-@BINPATH@/components/nsSidebar.manifest
-@BINPATH@/components/nsSidebar.js
+@BINPATH@/browser/components/nsSidebar.manifest
+@BINPATH@/browser/components/nsSidebar.js
 @BINPATH@/components/extensions.manifest
 @BINPATH@/components/addonManager.js
 @BINPATH@/components/amContentHandler.js
 @BINPATH@/components/amWebInstallListener.js
 @BINPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
 @BINPATH@/components/nsUpdateService.manifest
 @BINPATH@/components/nsUpdateService.js
 @BINPATH@/components/nsUpdateServiceStub.js
 #endif
 @BINPATH@/components/nsUpdateTimerManager.manifest
 @BINPATH@/components/nsUpdateTimerManager.js
 @BINPATH@/components/pluginGlue.manifest
-@BINPATH@/components/nsSessionStore.manifest
-@BINPATH@/components/nsSessionStartup.js
-@BINPATH@/components/nsSessionStore.js
+@BINPATH@/browser/components/nsSessionStore.manifest
+@BINPATH@/browser/components/nsSessionStartup.js
+@BINPATH@/browser/components/nsSessionStore.js
 @BINPATH@/components/nsURLFormatter.manifest
 @BINPATH@/components/nsURLFormatter.js
 #ifndef XP_OS2
-@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
+@BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
 #else
-@BINPATH@/components/brwsrcmp@DLL_SUFFIX@
+@BINPATH@/browser/components/brwsrcmp@DLL_SUFFIX@
 #endif
 @BINPATH@/components/txEXSLTRegExFunctions.manifest
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/toolkitplaces.manifest
 @BINPATH@/components/nsLivemarkService.js
 @BINPATH@/components/nsTaggingService.js
 @BINPATH@/components/nsPlacesAutoComplete.manifest
 @BINPATH@/components/nsPlacesAutoComplete.js
 @BINPATH@/components/nsPlacesExpiration.js
-@BINPATH@/components/PlacesProtocolHandler.js
+@BINPATH@/browser/components/PlacesProtocolHandler.js
 @BINPATH@/components/PlacesCategoriesStarter.js
 @BINPATH@/components/ColorAnalyzer.js
-@BINPATH@/components/PageThumbsProtocol.js
+@BINPATH@/browser/components/PageThumbsProtocol.js
 @BINPATH@/components/nsDefaultCLH.manifest
 @BINPATH@/components/nsDefaultCLH.js
 @BINPATH@/components/nsContentPrefService.manifest
 @BINPATH@/components/nsContentPrefService.js
 @BINPATH@/components/nsContentDispatchChooser.manifest
 @BINPATH@/components/nsContentDispatchChooser.js
 @BINPATH@/components/nsHandlerService.manifest
 @BINPATH@/components/nsHandlerService.js
@@ -441,31 +443,40 @@
 @BINPATH@/components/RILContentHelper.js
 @BINPATH@/components/MobileMessageDatabaseService.manifest
 @BINPATH@/components/MobileMessageDatabaseService.js
 @BINPATH@/components/WifiWorker.js
 @BINPATH@/components/WifiWorker.manifest
 @BINPATH@/components/DOMWifiManager.js
 @BINPATH@/components/DOMWifiManager.manifest
 #endif
-@BINPATH@/components/BrowserProfileMigrators.manifest
-@BINPATH@/components/ProfileMigrator.js
-@BINPATH@/components/ChromeProfileMigrator.js
-@BINPATH@/components/FirefoxProfileMigrator.js
+@BINPATH@/browser/components/BrowserProfileMigrators.manifest
+@BINPATH@/browser/components/ProfileMigrator.js
+@BINPATH@/browser/components/ChromeProfileMigrator.js
+@BINPATH@/browser/components/FirefoxProfileMigrator.js
 #ifdef XP_WIN
-@BINPATH@/components/IEProfileMigrator.js
-@BINPATH@/components/SafariProfileMigrator.js
+@BINPATH@/browser/components/IEProfileMigrator.js
+@BINPATH@/browser/components/SafariProfileMigrator.js
 #endif
 #ifdef XP_MACOSX
-@BINPATH@/components/SafariProfileMigrator.js
+@BINPATH@/browser/components/SafariProfileMigrator.js
 @BINPATH@/components/libalerts.dylib
 #endif
 #ifdef MOZ_ENABLE_DBUS
 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
+#ifdef MOZ_ENABLE_GNOME_COMPONENT
+@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+#endif
+#ifdef MOZ_ENABLE_GNOMEVFS
+@BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
+#endif
+#if defined(XP_MACOSX) || defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS)
+@BINPATH@/components/components.manifest
+#endif
 @BINPATH@/components/nsINIProcessor.manifest
 @BINPATH@/components/nsINIProcessor.js
 @BINPATH@/components/nsPrompter.manifest
 @BINPATH@/components/nsPrompter.js
 #ifdef MOZ_DATA_REPORTING
 @BINPATH@/components/DataReporting.manifest
 @BINPATH@/components/DataReportingService.js
 #endif
@@ -514,72 +525,72 @@
 #ifdef ENABLE_MARIONETTE
 @BINPATH@/chrome/marionette@JAREXT@
 @BINPATH@/chrome/marionette.manifest
 @BINPATH@/components/MarionetteComponents.manifest
 @BINPATH@/components/marionettecomponent.js
 #endif
 
 ; Modules
+@BINPATH@/browser/modules/*
 @BINPATH@/modules/*
 
 ; Safe Browsing
 #ifdef MOZ_URL_CLASSIFIER
 @BINPATH@/components/nsURLClassifier.manifest
 @BINPATH@/components/nsUrlClassifierHashCompleter.js
 @BINPATH@/components/nsUrlClassifierListManager.js
 @BINPATH@/components/nsUrlClassifierLib.js
 @BINPATH@/components/url-classifier.xpt
 #endif
 
-; GNOME hooks
-#ifdef MOZ_ENABLE_GNOME_COMPONENT
-@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
-#endif
-
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
 #endif
 
 ; [Browser Chrome Files]
-@BINPATH@/chrome/browser@JAREXT@
-@BINPATH@/chrome/browser.manifest
-@BINPATH@/chrome/pdfjs.manifest
-@BINPATH@/chrome/pdfjs/*
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@BINPATH@/browser/chrome.manifest
+@BINPATH@/browser/chrome/browser@JAREXT@
+@BINPATH@/browser/chrome/browser.manifest
+@BINPATH@/browser/chrome/pdfjs.manifest
+@BINPATH@/browser/chrome/pdfjs/*
+@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 #ifdef SHIP_FEEDBACK
-@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
+@BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi
 #endif
 @BINPATH@/chrome/toolkit@JAREXT@
 @BINPATH@/chrome/toolkit.manifest
 #ifdef MOZ_GTK2
-@BINPATH@/chrome/icons/default/default16.png
-@BINPATH@/chrome/icons/default/default32.png
-@BINPATH@/chrome/icons/default/default48.png
+@BINPATH@/browser/chrome/icons/default/default16.png
+@BINPATH@/browser/chrome/icons/default/default32.png
+@BINPATH@/browser/chrome/icons/default/default48.png
 #endif
 
 ; shell icons
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
-@BINPATH@/icons/*.png
+; shell icons
+@BINPATH@/browser/icons/*.png
+; updater icon
+@BINPATH@/icons/updater.png
 #endif
 #endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
-@BINPATH@/@PREF_DIR@/firefox.js
-@BINPATH@/@PREF_DIR@/firefox-branding.js
+@BINPATH@/browser/@PREF_DIR@/firefox.js
+@BINPATH@/browser/@PREF_DIR@/firefox-branding.js
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
-@BINPATH@/defaults/profile/prefs.js
+@BINPATH@/browser/defaults/profile/prefs.js
 
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @BINPATH@/defaults/pref/channel-prefs.js
 #else
 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
@@ -692,28 +703,22 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
 @BINPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @BINPATH@/Throbber-small.gif
 #endif
 #endif
-@BINPATH@/crashreporter-override.ini
+@BINPATH@/browser/crashreporter-override.ini
 #ifdef MOZ_CRASHREPORTER_INJECTOR
 @BINPATH@/breakpadinjector.dll
 #endif
 #endif
 
-; [Extensions]
-;
-#ifdef MOZ_ENABLE_GNOMEVFS
-bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
-#endif
-
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd
 @BINPATH@/*.xqs
 @BINPATH@/components/*.xqs
 #endif
 
 #ifdef MOZ_WEBAPP_RUNTIME
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -125,13 +125,13 @@
 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
 % locale testpilot @AB_CD@ %locale/feedback/
     locale/feedback/main.dtd                       (%feedback/main.dtd)
     locale/feedback/main.properties                (%feedback/main.properties)
 % locale pdf.js @AB_CD@ %locale/pdfviewer/
     locale/pdfviewer/viewer.properties             (%pdfviewer/viewer.properties)
     locale/pdfviewer/chrome.properties             (%pdfviewer/chrome.properties)
 #ifdef MOZ_WEBAPP_RUNTIME
-../webapprt/chrome/@AB_CD@.jar:
+../../webapprt/chrome/@AB_CD@.jar:
 % locale webapprt @AB_CD@ %locale/webapprt/
     locale/webapprt/webapp.dtd                     (%webapprt/webapp.dtd)
     locale/webapprt/webapp.properties              (%webapprt/webapp.properties)
 #endif
--- a/browser/modules/test/unit/xpcshell.ini
+++ b/browser/modules/test/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head =
 tail =
+firefox-appdir = browser
 
 [test_newtab-migrate-v1.js]
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_global.js head_helpers.js head_http.js
 tail =
+firefox-appdir = browser
 
 # Test load modules first so syntax failures are caught early.
 [test_load_modules.js]
 
 [test_utils_atob.js]
 [test_utils_convert_string.js]
 [test_utils_dateprefs.js]
 [test_utils_deepCopy.js]
--- a/services/crypto/component/tests/unit/xpcshell.ini
+++ b/services/crypto/component/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
+firefox-appdir = browser
 
 [test_jpake.js]
--- a/services/crypto/tests/unit/xpcshell.ini
+++ b/services/crypto/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_helpers.js ../../../common/tests/unit/head_helpers.js
 tail =
+firefox-appdir = browser
 
 [test_load_modules.js]
 
 [test_crypto_crypt.js]
 [test_crypto_deriveKey.js]
 [test_crypto_random.js]
 # Bug 676977: test hangs consistently on Android
 skip-if = os == "android"
--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_appinfo.js ../../../common/tests/unit/head_helpers.js head_helpers.js head_http_server.js
 tail =
+firefox-appdir = browser
 
 # The manifest is roughly ordered from low-level to high-level. When making
 # systemic sweeping changes, this makes it easier to identify errors closer to
 # the source.
 
 # Ensure we can import everything.
 [test_load_modules.js]
 
--- a/toolkit/components/downloads/test/unit/xpcshell.ini
+++ b/toolkit/components/downloads/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_download_manager.js
 tail =
+firefox-appdir = browser
 
 [test_bug_382825.js]
 [test_bug_384744.js]
 [test_bug_395092.js]
 [test_bug_401430.js]
 [test_bug_401582.js]
 [test_bug_406857.js]
 [test_bug_409179.js]
--- a/toolkit/components/places/tests/autocomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/autocomplete/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail = 
+firefox-appdir = browser
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
 [test_418257.js]
 [test_422277.js]
 [test_autocomplete_on_value_removed_479089.js]
 # Bug 676989: test fails consistently on Android
--- a/toolkit/components/places/tests/unit/xpcshell.ini
+++ b/toolkit/components/places/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail =
+firefox-appdir = browser
 
 [test_000_frecency.js]
 [test_317472.js]
 # Bug 676989: test hangs consistently on Android
 skip-if = os == "android"
 [test_331487.js]
 [test_384370.js]
 [test_385397.js]
--- a/toolkit/components/search/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_search.js
 tail = 
+firefox-appdir = browser
 
 [test_nodb.js]
 [test_nodb_pluschanges.js]
 [test_migratedb.js]
 [test_645970.js]
 [test_init_async_multiple.js]
 [test_init_async_multiple_then_sync.js]
 
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_addons.js
 tail = 
+firefox-appdir = browser
 
 [test_AddonRepository.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_AddonRepository_cache.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_AddonRepository_compatmode.js]