Issue %3005 - Move toolkit/components to components/

1238 files changed, 135 insertions, 135 deletions

diff --git a/toolkit/components/.eslintrc.js b/components/.eslintrc.js
index e6cf2032e..e6cf2032e 100644
--- a/toolkit/components/.eslintrc.js
+++ b/components/.eslintrc.js
diff --git a/toolkit/components/aboutcache/content/aboutCache.js b/components/aboutcache/content/aboutCache.js
index e945d683e..e945d683e 100644
--- a/toolkit/components/aboutcache/content/aboutCache.js
+++ b/components/aboutcache/content/aboutCache.js
diff --git a/toolkit/components/aboutcache/jar.mn b/components/aboutcache/jar.mn
index b414a8f6d..b414a8f6d 100644
--- a/toolkit/components/aboutcache/jar.mn
+++ b/components/aboutcache/jar.mn
diff --git a/toolkit/components/aboutcache/moz.build b/components/aboutcache/moz.build
index aee4b90a5..aee4b90a5 100644
--- a/toolkit/components/aboutcache/moz.build
+++ b/components/aboutcache/moz.build
diff --git a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.css b/components/aboutcheckerboard/content/aboutCheckerboard.css
index 7f88612db..7f88612db 100644
--- a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.css
+++ b/components/aboutcheckerboard/content/aboutCheckerboard.css
diff --git a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.js b/components/aboutcheckerboard/content/aboutCheckerboard.js
index c64a80a05..c64a80a05 100644
--- a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.js
+++ b/components/aboutcheckerboard/content/aboutCheckerboard.js
diff --git a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.xhtml b/components/aboutcheckerboard/content/aboutCheckerboard.xhtml
index 6a8a61896..6a8a61896 100644
--- a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.xhtml
+++ b/components/aboutcheckerboard/content/aboutCheckerboard.xhtml
diff --git a/toolkit/components/aboutcheckerboard/jar.mn b/components/aboutcheckerboard/jar.mn
index 64d5bfc8e..64d5bfc8e 100644
--- a/toolkit/components/aboutcheckerboard/jar.mn
+++ b/components/aboutcheckerboard/jar.mn
diff --git a/toolkit/components/aboutcheckerboard/moz.build b/components/aboutcheckerboard/moz.build
index 635fa39c9..635fa39c9 100644
--- a/toolkit/components/aboutcheckerboard/moz.build
+++ b/components/aboutcheckerboard/moz.build
diff --git a/toolkit/components/aboutmemory/content/aboutCompartments.xhtml b/components/aboutmemory/content/aboutCompartments.xhtml
index 83432295a..83432295a 100644
--- a/toolkit/components/aboutmemory/content/aboutCompartments.xhtml
+++ b/components/aboutmemory/content/aboutCompartments.xhtml
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.css b/components/aboutmemory/content/aboutMemory.css
index cf4d36de8..cf4d36de8 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.css
+++ b/components/aboutmemory/content/aboutMemory.css
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/components/aboutmemory/content/aboutMemory.js
index 1411c3120..1411c3120 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/components/aboutmemory/content/aboutMemory.js
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.xhtml b/components/aboutmemory/content/aboutMemory.xhtml
index e20b3b624..e20b3b624 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.xhtml
+++ b/components/aboutmemory/content/aboutMemory.xhtml
diff --git a/toolkit/components/aboutmemory/jar.mn b/components/aboutmemory/jar.mn
index 0a6b01ed7..0a6b01ed7 100644
--- a/toolkit/components/aboutmemory/jar.mn
+++ b/components/aboutmemory/jar.mn
diff --git a/toolkit/components/aboutmemory/moz.build b/components/aboutmemory/moz.build
index aee4b90a5..aee4b90a5 100644
--- a/toolkit/components/aboutmemory/moz.build
+++ b/components/aboutmemory/moz.build
diff --git a/toolkit/components/aboutperformance/content/aboutPerformance.js b/components/aboutperformance/content/aboutPerformance.js
index 042aac258..042aac258 100644
--- a/toolkit/components/aboutperformance/content/aboutPerformance.js
+++ b/components/aboutperformance/content/aboutPerformance.js
diff --git a/toolkit/components/aboutperformance/content/aboutPerformance.xhtml b/components/aboutperformance/content/aboutPerformance.xhtml
index 6e0d14802..6e0d14802 100644
--- a/toolkit/components/aboutperformance/content/aboutPerformance.xhtml
+++ b/components/aboutperformance/content/aboutPerformance.xhtml
diff --git a/toolkit/components/aboutperformance/jar.mn b/components/aboutperformance/jar.mn
index 96e046d8e..96e046d8e 100644
--- a/toolkit/components/aboutperformance/jar.mn
+++ b/components/aboutperformance/jar.mn
diff --git a/toolkit/components/aboutperformance/moz.build b/components/aboutperformance/moz.build
index aee4b90a5..aee4b90a5 100644
--- a/toolkit/components/aboutperformance/moz.build
+++ b/components/aboutperformance/moz.build
diff --git a/toolkit/components/addoncompat/CompatWarning.jsm b/components/addoncompat/CompatWarning.jsm
index c4d45adee..c4d45adee 100644
--- a/toolkit/components/addoncompat/CompatWarning.jsm
+++ b/components/addoncompat/CompatWarning.jsm
diff --git a/toolkit/components/addoncompat/Prefetcher.jsm b/components/addoncompat/Prefetcher.jsm
index 2d836690c..2d836690c 100644
--- a/toolkit/components/addoncompat/Prefetcher.jsm
+++ b/components/addoncompat/Prefetcher.jsm
diff --git a/toolkit/components/addoncompat/RemoteAddonsChild.jsm b/components/addoncompat/RemoteAddonsChild.jsm
index 1aacc7f7a..1aacc7f7a 100644
--- a/toolkit/components/addoncompat/RemoteAddonsChild.jsm
+++ b/components/addoncompat/RemoteAddonsChild.jsm
diff --git a/toolkit/components/addoncompat/RemoteAddonsParent.jsm b/components/addoncompat/RemoteAddonsParent.jsm
index 5cadc2902..5cadc2902 100644
--- a/toolkit/components/addoncompat/RemoteAddonsParent.jsm
+++ b/components/addoncompat/RemoteAddonsParent.jsm
diff --git a/toolkit/components/addoncompat/ShimWaiver.jsm b/components/addoncompat/ShimWaiver.jsm
index 402ab4c32..402ab4c32 100644
--- a/toolkit/components/addoncompat/ShimWaiver.jsm
+++ b/components/addoncompat/ShimWaiver.jsm
diff --git a/toolkit/components/addoncompat/addoncompat.manifest b/components/addoncompat/addoncompat.manifest
index fe38f47d8..fe38f47d8 100644
--- a/toolkit/components/addoncompat/addoncompat.manifest
+++ b/components/addoncompat/addoncompat.manifest
diff --git a/toolkit/components/addoncompat/defaultShims.js b/components/addoncompat/defaultShims.js
index a786efed7..a786efed7 100644
--- a/toolkit/components/addoncompat/defaultShims.js
+++ b/components/addoncompat/defaultShims.js
diff --git a/toolkit/components/addoncompat/moz.build b/components/addoncompat/moz.build
index a8ce00cec..a8ce00cec 100644
--- a/toolkit/components/addoncompat/moz.build
+++ b/components/addoncompat/moz.build
diff --git a/toolkit/components/addoncompat/multiprocessShims.js b/components/addoncompat/multiprocessShims.js
index 8b252a0c4..8b252a0c4 100644
--- a/toolkit/components/addoncompat/multiprocessShims.js
+++ b/components/addoncompat/multiprocessShims.js
diff --git a/toolkit/components/alerts/content/alert.css b/components/alerts/content/alert.css
index 81e5cdd35..81e5cdd35 100644
--- a/toolkit/components/alerts/content/alert.css
+++ b/components/alerts/content/alert.css
diff --git a/toolkit/components/alerts/content/alert.js b/components/alerts/content/alert.js
index b2ebedbc0..b2ebedbc0 100644
--- a/toolkit/components/alerts/content/alert.js
+++ b/components/alerts/content/alert.js
diff --git a/toolkit/components/alerts/content/alert.xul b/components/alerts/content/alert.xul
index 1549f4530..1549f4530 100644
--- a/toolkit/components/alerts/content/alert.xul
+++ b/components/alerts/content/alert.xul
diff --git a/toolkit/components/alerts/jar.mn b/components/alerts/jar.mn
index 55a90ce9a..55a90ce9a 100644
--- a/toolkit/components/alerts/jar.mn
+++ b/components/alerts/jar.mn
diff --git a/toolkit/components/alerts/locale/alert.dtd b/components/alerts/locale/alert.dtd
index 5f0f49d22..5f0f49d22 100644
--- a/toolkit/components/alerts/locale/alert.dtd
+++ b/components/alerts/locale/alert.dtd
diff --git a/toolkit/components/alerts/locale/alert.properties b/components/alerts/locale/alert.properties
index af482adb1..af482adb1 100644
--- a/toolkit/components/alerts/locale/alert.properties
+++ b/components/alerts/locale/alert.properties
diff --git a/toolkit/components/alerts/moz.build b/components/alerts/moz.build
index 286391d99..286391d99 100644
--- a/toolkit/components/alerts/moz.build
+++ b/components/alerts/moz.build
diff --git a/toolkit/components/alerts/public/nsIAlertsService.idl b/components/alerts/public/nsIAlertsService.idl
index d22d85a2e..d22d85a2e 100644
--- a/toolkit/components/alerts/public/nsIAlertsService.idl
+++ b/components/alerts/public/nsIAlertsService.idl
diff --git a/toolkit/components/alerts/src/AlertNotification.cpp b/components/alerts/src/AlertNotification.cpp
index b828f1100..b828f1100 100644
--- a/toolkit/components/alerts/src/AlertNotification.cpp
+++ b/components/alerts/src/AlertNotification.cpp
diff --git a/toolkit/components/alerts/src/AlertNotification.h b/components/alerts/src/AlertNotification.h
index c0bcc0ba9..c0bcc0ba9 100644
--- a/toolkit/components/alerts/src/AlertNotification.h
+++ b/components/alerts/src/AlertNotification.h
diff --git a/toolkit/components/alerts/src/AlertNotificationIPCSerializer.h b/components/alerts/src/AlertNotificationIPCSerializer.h
index 9544f9633..9544f9633 100644
--- a/toolkit/components/alerts/src/AlertNotificationIPCSerializer.h
+++ b/components/alerts/src/AlertNotificationIPCSerializer.h
diff --git a/toolkit/components/alerts/src/nsAlertsService.cpp b/components/alerts/src/nsAlertsService.cpp
index 4f248c861..4f248c861 100644
--- a/toolkit/components/alerts/src/nsAlertsService.cpp
+++ b/components/alerts/src/nsAlertsService.cpp
diff --git a/toolkit/components/alerts/src/nsAlertsService.h b/components/alerts/src/nsAlertsService.h
index d2b2e1e6c..d2b2e1e6c 100644
--- a/toolkit/components/alerts/src/nsAlertsService.h
+++ b/components/alerts/src/nsAlertsService.h
diff --git a/toolkit/components/alerts/src/nsAlertsUtils.cpp b/components/alerts/src/nsAlertsUtils.cpp
index 5f7d92d2a..5f7d92d2a 100644
--- a/toolkit/components/alerts/src/nsAlertsUtils.cpp
+++ b/components/alerts/src/nsAlertsUtils.cpp
diff --git a/toolkit/components/alerts/src/nsAlertsUtils.h b/components/alerts/src/nsAlertsUtils.h
index bc11f6351..bc11f6351 100644
--- a/toolkit/components/alerts/src/nsAlertsUtils.h
+++ b/components/alerts/src/nsAlertsUtils.h
diff --git a/toolkit/components/alerts/src/nsXULAlerts.cpp b/components/alerts/src/nsXULAlerts.cpp
index 47e72a27f..47e72a27f 100644
--- a/toolkit/components/alerts/src/nsXULAlerts.cpp
+++ b/components/alerts/src/nsXULAlerts.cpp
diff --git a/toolkit/components/alerts/src/nsXULAlerts.h b/components/alerts/src/nsXULAlerts.h
index 557716ee6..557716ee6 100644
--- a/toolkit/components/alerts/src/nsXULAlerts.h
+++ b/components/alerts/src/nsXULAlerts.h
diff --git a/toolkit/components/apppicker/content/appPicker.js b/components/apppicker/content/appPicker.js
index 6922fce39..6922fce39 100644
--- a/toolkit/components/apppicker/content/appPicker.js
+++ b/components/apppicker/content/appPicker.js
diff --git a/toolkit/components/apppicker/content/appPicker.xul b/components/apppicker/content/appPicker.xul
index 3a50483c1..3a50483c1 100644
--- a/toolkit/components/apppicker/content/appPicker.xul
+++ b/components/apppicker/content/appPicker.xul
diff --git a/toolkit/components/apppicker/jar.mn b/components/apppicker/jar.mn
index d8431c3fe..d8431c3fe 100644
--- a/toolkit/components/apppicker/jar.mn
+++ b/components/apppicker/jar.mn
diff --git a/toolkit/components/apppicker/moz.build b/components/apppicker/moz.build
index 635fa39c9..635fa39c9 100644
--- a/toolkit/components/apppicker/moz.build
+++ b/components/apppicker/moz.build
diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.jsm b/components/asyncshutdown/AsyncShutdown.jsm
index 43fdc6bf1..43fdc6bf1 100644
--- a/toolkit/components/asyncshutdown/AsyncShutdown.jsm
+++ b/components/asyncshutdown/AsyncShutdown.jsm
diff --git a/toolkit/components/asyncshutdown/moz.build b/components/asyncshutdown/moz.build
index 861e991c7..861e991c7 100644
--- a/toolkit/components/asyncshutdown/moz.build
+++ b/components/asyncshutdown/moz.build
diff --git a/toolkit/components/asyncshutdown/nsAsyncShutdown.js b/components/asyncshutdown/nsAsyncShutdown.js
index 70fea9076..70fea9076 100644
--- a/toolkit/components/asyncshutdown/nsAsyncShutdown.js
+++ b/components/asyncshutdown/nsAsyncShutdown.js
diff --git a/toolkit/components/asyncshutdown/nsAsyncShutdown.manifest b/components/asyncshutdown/nsAsyncShutdown.manifest
index 67f247902..67f247902 100644
--- a/toolkit/components/asyncshutdown/nsAsyncShutdown.manifest
+++ b/components/asyncshutdown/nsAsyncShutdown.manifest
diff --git a/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl b/components/asyncshutdown/nsIAsyncShutdown.idl
index 2f8ca5046..2f8ca5046 100644
--- a/toolkit/components/asyncshutdown/nsIAsyncShutdown.idl
+++ b/components/asyncshutdown/nsIAsyncShutdown.idl
diff --git a/toolkit/components/autocomplete/moz.build b/components/autocomplete/moz.build
index 7ea920144..7ea920144 100644
--- a/toolkit/components/autocomplete/moz.build
+++ b/components/autocomplete/moz.build
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/components/autocomplete/nsAutoCompleteController.cpp
index 37b2e5dfa..37b2e5dfa 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/components/autocomplete/nsAutoCompleteController.cpp
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.h b/components/autocomplete/nsAutoCompleteController.h
index 62aa980f6..62aa980f6 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.h
+++ b/components/autocomplete/nsAutoCompleteController.h
diff --git a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp b/components/autocomplete/nsAutoCompleteSimpleResult.cpp
index 683ac462a..683ac462a 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp
+++ b/components/autocomplete/nsAutoCompleteSimpleResult.cpp
diff --git a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h b/components/autocomplete/nsAutoCompleteSimpleResult.h
index 61ee542e4..61ee542e4 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
+++ b/components/autocomplete/nsAutoCompleteSimpleResult.h
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteController.idl b/components/autocomplete/nsIAutoCompleteController.idl
index 0b68032dc..0b68032dc 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteController.idl
+++ b/components/autocomplete/nsIAutoCompleteController.idl
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteInput.idl b/components/autocomplete/nsIAutoCompleteInput.idl
index 26a75ea77..26a75ea77 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteInput.idl
+++ b/components/autocomplete/nsIAutoCompleteInput.idl
diff --git a/toolkit/components/autocomplete/nsIAutoCompletePopup.idl b/components/autocomplete/nsIAutoCompletePopup.idl
index cb5dda6f2..cb5dda6f2 100644
--- a/toolkit/components/autocomplete/nsIAutoCompletePopup.idl
+++ b/components/autocomplete/nsIAutoCompletePopup.idl
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteResult.idl b/components/autocomplete/nsIAutoCompleteResult.idl
index 9ae22ade7..9ae22ade7 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteResult.idl
+++ b/components/autocomplete/nsIAutoCompleteResult.idl
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteSearch.idl b/components/autocomplete/nsIAutoCompleteSearch.idl
index 188c333ac..188c333ac 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteSearch.idl
+++ b/components/autocomplete/nsIAutoCompleteSearch.idl
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl b/components/autocomplete/nsIAutoCompleteSimpleResult.idl
index 6a8827ab8..6a8827ab8 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl
+++ b/components/autocomplete/nsIAutoCompleteSimpleResult.idl
diff --git a/toolkit/components/bindings/content/autocomplete.xml b/components/bindings/content/autocomplete.xml
index da2bf678d..da2bf678d 100644
--- a/toolkit/components/bindings/content/autocomplete.xml
+++ b/components/bindings/content/autocomplete.xml
diff --git a/toolkit/components/bindings/content/browser.xml b/components/bindings/content/browser.xml
index 712a11b73..712a11b73 100644
--- a/toolkit/components/bindings/content/browser.xml
+++ b/components/bindings/content/browser.xml
diff --git a/toolkit/components/bindings/content/button.xml b/components/bindings/content/button.xml
index 89d9d86c6..89d9d86c6 100644
--- a/toolkit/components/bindings/content/button.xml
+++ b/components/bindings/content/button.xml
diff --git a/toolkit/components/bindings/content/calendar.js b/components/bindings/content/calendar.js
index 44ba67501..44ba67501 100644
--- a/toolkit/components/bindings/content/calendar.js
+++ b/components/bindings/content/calendar.js
diff --git a/toolkit/components/bindings/content/checkbox.xml b/components/bindings/content/checkbox.xml
index c6a5babfd..c6a5babfd 100644
--- a/toolkit/components/bindings/content/checkbox.xml
+++ b/components/bindings/content/checkbox.xml
diff --git a/toolkit/components/bindings/content/colorpicker.xml b/components/bindings/content/colorpicker.xml
index 30f8a6354..30f8a6354 100644
--- a/toolkit/components/bindings/content/colorpicker.xml
+++ b/components/bindings/content/colorpicker.xml
diff --git a/toolkit/components/bindings/content/datekeeper.js b/components/bindings/content/datekeeper.js
index 5d70416a9..5d70416a9 100644
--- a/toolkit/components/bindings/content/datekeeper.js
+++ b/components/bindings/content/datekeeper.js
diff --git a/toolkit/components/bindings/content/datepicker.js b/components/bindings/content/datepicker.js
index 0e9c9a6e6..0e9c9a6e6 100644
--- a/toolkit/components/bindings/content/datepicker.js
+++ b/components/bindings/content/datepicker.js
diff --git a/toolkit/components/bindings/content/datetimebox.css b/components/bindings/content/datetimebox.css
index ce638078f..ce638078f 100644
--- a/toolkit/components/bindings/content/datetimebox.css
+++ b/components/bindings/content/datetimebox.css
diff --git a/toolkit/components/bindings/content/datetimebox.xml b/components/bindings/content/datetimebox.xml
index 94574038a..94574038a 100644
--- a/toolkit/components/bindings/content/datetimebox.xml
+++ b/components/bindings/content/datetimebox.xml
diff --git a/toolkit/components/bindings/content/datetimepicker.xml b/components/bindings/content/datetimepicker.xml
index 1d6a5e772..1d6a5e772 100644
--- a/toolkit/components/bindings/content/datetimepicker.xml
+++ b/components/bindings/content/datetimepicker.xml
diff --git a/toolkit/components/bindings/content/datetimepopup.xml b/components/bindings/content/datetimepopup.xml
index 19e7b4f8a..19e7b4f8a 100644
--- a/toolkit/components/bindings/content/datetimepopup.xml
+++ b/components/bindings/content/datetimepopup.xml
diff --git a/toolkit/components/bindings/content/dialog.xml b/components/bindings/content/dialog.xml
index aff162196..aff162196 100644
--- a/toolkit/components/bindings/content/dialog.xml
+++ b/components/bindings/content/dialog.xml
diff --git a/toolkit/components/bindings/content/editor.xml b/components/bindings/content/editor.xml
index 637586dc2..637586dc2 100644
--- a/toolkit/components/bindings/content/editor.xml
+++ b/components/bindings/content/editor.xml
diff --git a/toolkit/components/bindings/content/expander.xml b/components/bindings/content/expander.xml
index a4ffea313..a4ffea313 100644
--- a/toolkit/components/bindings/content/expander.xml
+++ b/components/bindings/content/expander.xml
diff --git a/toolkit/components/bindings/content/filefield.xml b/components/bindings/content/filefield.xml
index f81761eb5..f81761eb5 100644
--- a/toolkit/components/bindings/content/filefield.xml
+++ b/components/bindings/content/filefield.xml
diff --git a/toolkit/components/bindings/content/findbar.xml b/components/bindings/content/findbar.xml
index aae799554..aae799554 100644
--- a/toolkit/components/bindings/content/findbar.xml
+++ b/components/bindings/content/findbar.xml
diff --git a/toolkit/components/bindings/content/general.xml b/components/bindings/content/general.xml
index b4538e41d..b4538e41d 100644
--- a/toolkit/components/bindings/content/general.xml
+++ b/components/bindings/content/general.xml
diff --git a/toolkit/components/bindings/content/groupbox.xml b/components/bindings/content/groupbox.xml
index 7cd3276b4..7cd3276b4 100644
--- a/toolkit/components/bindings/content/groupbox.xml
+++ b/components/bindings/content/groupbox.xml
diff --git a/toolkit/components/bindings/content/listbox.xml b/components/bindings/content/listbox.xml
index 9fae61669..9fae61669 100644
--- a/toolkit/components/bindings/content/listbox.xml
+++ b/components/bindings/content/listbox.xml
diff --git a/toolkit/components/bindings/content/menu.xml b/components/bindings/content/menu.xml
index 26dcad454..26dcad454 100644
--- a/toolkit/components/bindings/content/menu.xml
+++ b/components/bindings/content/menu.xml
diff --git a/toolkit/components/bindings/content/menulist.xml b/components/bindings/content/menulist.xml
index 96c011809..96c011809 100644
--- a/toolkit/components/bindings/content/menulist.xml
+++ b/components/bindings/content/menulist.xml
diff --git a/toolkit/components/bindings/content/notification.xml b/components/bindings/content/notification.xml
index 2cc2f4b2c..2cc2f4b2c 100644
--- a/toolkit/components/bindings/content/notification.xml
+++ b/components/bindings/content/notification.xml
diff --git a/toolkit/components/bindings/content/numberbox.xml b/components/bindings/content/numberbox.xml
index 0e1225f09..0e1225f09 100644
--- a/toolkit/components/bindings/content/numberbox.xml
+++ b/components/bindings/content/numberbox.xml
diff --git a/toolkit/components/bindings/content/optionsDialog.xml b/components/bindings/content/optionsDialog.xml
index efd20663e..efd20663e 100644
--- a/toolkit/components/bindings/content/optionsDialog.xml
+++ b/components/bindings/content/optionsDialog.xml
diff --git a/toolkit/components/bindings/content/popup.xml b/components/bindings/content/popup.xml
index c8a395c40..c8a395c40 100644
--- a/toolkit/components/bindings/content/popup.xml
+++ b/components/bindings/content/popup.xml
diff --git a/toolkit/components/bindings/content/preferences.xml b/components/bindings/content/preferences.xml
index f7cb10948..f7cb10948 100644
--- a/toolkit/components/bindings/content/preferences.xml
+++ b/components/bindings/content/preferences.xml
diff --git a/toolkit/components/bindings/content/progressmeter.xml b/components/bindings/content/progressmeter.xml
index 82f28ffba..82f28ffba 100644
--- a/toolkit/components/bindings/content/progressmeter.xml
+++ b/components/bindings/content/progressmeter.xml
diff --git a/toolkit/components/bindings/content/radio.xml b/components/bindings/content/radio.xml
index de3acfbf6..de3acfbf6 100644
--- a/toolkit/components/bindings/content/radio.xml
+++ b/components/bindings/content/radio.xml
diff --git a/toolkit/components/bindings/content/remote-browser.xml b/components/bindings/content/remote-browser.xml
index b78179944..b78179944 100644
--- a/toolkit/components/bindings/content/remote-browser.xml
+++ b/components/bindings/content/remote-browser.xml
diff --git a/toolkit/components/bindings/content/resizer.xml b/components/bindings/content/resizer.xml
index 006877a4f..006877a4f 100644
--- a/toolkit/components/bindings/content/resizer.xml
+++ b/components/bindings/content/resizer.xml
diff --git a/toolkit/components/bindings/content/richlistbox.xml b/components/bindings/content/richlistbox.xml
index dd04a0cff..dd04a0cff 100644
--- a/toolkit/components/bindings/content/richlistbox.xml
+++ b/components/bindings/content/richlistbox.xml
diff --git a/toolkit/components/bindings/content/scale.xml b/components/bindings/content/scale.xml
index 3e5f5aeb2..3e5f5aeb2 100644
--- a/toolkit/components/bindings/content/scale.xml
+++ b/components/bindings/content/scale.xml
diff --git a/toolkit/components/bindings/content/scrollbar.xml b/components/bindings/content/scrollbar.xml
index ce2eff11b..ce2eff11b 100644
--- a/toolkit/components/bindings/content/scrollbar.xml
+++ b/components/bindings/content/scrollbar.xml
diff --git a/toolkit/components/bindings/content/scrollbox.xml b/components/bindings/content/scrollbox.xml
index 219b7cb5e..219b7cb5e 100644
--- a/toolkit/components/bindings/content/scrollbox.xml
+++ b/components/bindings/content/scrollbox.xml
diff --git a/toolkit/components/bindings/content/spinbuttons.xml b/components/bindings/content/spinbuttons.xml
index 3a695beac..3a695beac 100644
--- a/toolkit/components/bindings/content/spinbuttons.xml
+++ b/components/bindings/content/spinbuttons.xml
diff --git a/toolkit/components/bindings/content/spinner.js b/components/bindings/content/spinner.js
index 4901320b5..4901320b5 100644
--- a/toolkit/components/bindings/content/spinner.js
+++ b/components/bindings/content/spinner.js
diff --git a/toolkit/components/bindings/content/splitter.xml b/components/bindings/content/splitter.xml
index d23631fbe..d23631fbe 100644
--- a/toolkit/components/bindings/content/splitter.xml
+++ b/components/bindings/content/splitter.xml
diff --git a/toolkit/components/bindings/content/stringbundle.xml b/components/bindings/content/stringbundle.xml
index 3365bd61f..3365bd61f 100644
--- a/toolkit/components/bindings/content/stringbundle.xml
+++ b/components/bindings/content/stringbundle.xml
diff --git a/toolkit/components/bindings/content/tabbox.xml b/components/bindings/content/tabbox.xml
index 60c395c13..60c395c13 100644
--- a/toolkit/components/bindings/content/tabbox.xml
+++ b/components/bindings/content/tabbox.xml
diff --git a/toolkit/components/bindings/content/text.xml b/components/bindings/content/text.xml
index ed998cee4..ed998cee4 100644
--- a/toolkit/components/bindings/content/text.xml
+++ b/components/bindings/content/text.xml
diff --git a/toolkit/components/bindings/content/textbox.xml b/components/bindings/content/textbox.xml
index f166fb78a..f166fb78a 100644
--- a/toolkit/components/bindings/content/textbox.xml
+++ b/components/bindings/content/textbox.xml
diff --git a/toolkit/components/bindings/content/timekeeper.js b/components/bindings/content/timekeeper.js
index 3b4e7eb0a..3b4e7eb0a 100644
--- a/toolkit/components/bindings/content/timekeeper.js
+++ b/components/bindings/content/timekeeper.js
diff --git a/toolkit/components/bindings/content/timepicker.js b/components/bindings/content/timepicker.js
index 1f0463fe4..1f0463fe4 100644
--- a/toolkit/components/bindings/content/timepicker.js
+++ b/components/bindings/content/timepicker.js
diff --git a/toolkit/components/bindings/content/toolbar.xml b/components/bindings/content/toolbar.xml
index 55cef8244..55cef8244 100644
--- a/toolkit/components/bindings/content/toolbar.xml
+++ b/components/bindings/content/toolbar.xml
diff --git a/toolkit/components/bindings/content/toolbarbutton.xml b/components/bindings/content/toolbarbutton.xml
index 5de3f040d..5de3f040d 100644
--- a/toolkit/components/bindings/content/toolbarbutton.xml
+++ b/components/bindings/content/toolbarbutton.xml
diff --git a/toolkit/components/bindings/content/tree.xml b/components/bindings/content/tree.xml
index 19a1fa772..19a1fa772 100644
--- a/toolkit/components/bindings/content/tree.xml
+++ b/components/bindings/content/tree.xml
diff --git a/toolkit/components/bindings/content/videocontrols.css b/components/bindings/content/videocontrols.css
index 99dbf5a2f..99dbf5a2f 100644
--- a/toolkit/components/bindings/content/videocontrols.css
+++ b/components/bindings/content/videocontrols.css
diff --git a/toolkit/components/bindings/content/videocontrols.xml b/components/bindings/content/videocontrols.xml
index 630f5a022..630f5a022 100644
--- a/toolkit/components/bindings/content/videocontrols.xml
+++ b/components/bindings/content/videocontrols.xml
diff --git a/toolkit/components/bindings/content/wizard.xml b/components/bindings/content/wizard.xml
index eb812f065..eb812f065 100644
--- a/toolkit/components/bindings/content/wizard.xml
+++ b/components/bindings/content/wizard.xml
diff --git a/toolkit/components/bindings/jar.mn b/components/bindings/jar.mn
index be47fe924..be47fe924 100644
--- a/toolkit/components/bindings/jar.mn
+++ b/components/bindings/jar.mn
diff --git a/toolkit/components/bindings/moz.build b/components/bindings/moz.build
index aee4b90a5..aee4b90a5 100644
--- a/toolkit/components/bindings/moz.build
+++ b/components/bindings/moz.build
diff --git a/toolkit/components/blocklist/blocklist.manifest b/components/blocklist/blocklist.manifest
index 6b63d6072..6b63d6072 100644
--- a/toolkit/components/blocklist/blocklist.manifest
+++ b/components/blocklist/blocklist.manifest
diff --git a/toolkit/components/blocklist/moz.build b/components/blocklist/moz.build
index 1cec7ab71..1cec7ab71 100644
--- a/toolkit/components/blocklist/moz.build
+++ b/components/blocklist/moz.build
diff --git a/toolkit/components/blocklist/nsBlocklistService.js b/components/blocklist/nsBlocklistService.js
index 188fdfb38..188fdfb38 100644
--- a/toolkit/components/blocklist/nsBlocklistService.js
+++ b/components/blocklist/nsBlocklistService.js
diff --git a/toolkit/components/build/moz.build b/components/build/moz.build
index 7cfc801a3..04dfc2199 100644
--- a/toolkit/components/build/moz.build
+++ b/components/build/moz.build
@@ -4,29 +4,29 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS += [
-    'nsToolkitCompsCID.h',
+  'nsToolkitCompsCID.h',
 ]
 
 SOURCES += [
-    'nsToolkitCompsModule.cpp',
+  'nsToolkitCompsModule.cpp',
 ]
 
-FINAL_LIBRARY = 'xul'
-
 LOCAL_INCLUDES += [
-    '../../xre',
-    '../alerts/src',
-    '../downloads/src',
-    '../feeds',
-    '../find',
-    '../jsdownloads/src',
-    '../perfmonitoring',
-    '../startup',
-    '../statusfilter',
-    '../typeaheadfind'
+  '../alerts/src',
+  '../downloads/src',
+  '../feeds',
+  '../find',
+  '../jsdownloads/src',
+  '../perfmonitoring',
+  '../startup',
+  '../statusfilter',
+  '../typeaheadfind',
+  '/toolkit/xre',
 ]
 
 if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']:
-    LOCAL_INCLUDES += [
-        '../parentalcontrols',
-    ]
+  LOCAL_INCLUDES += [
+    '../parentalcontrols',
+  ]
+
+FINAL_LIBRARY = 'xul'
\ No newline at end of file
diff --git a/toolkit/components/build/nsToolkitCompsCID.h b/components/build/nsToolkitCompsCID.h
index 6f01a79f6..6f01a79f6 100644
--- a/toolkit/components/build/nsToolkitCompsCID.h
+++ b/components/build/nsToolkitCompsCID.h
diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/components/build/nsToolkitCompsModule.cpp
index 26ae84b6e..26ae84b6e 100644
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/components/build/nsToolkitCompsModule.cpp
diff --git a/toolkit/components/captivedetect/CaptivePortalDetectComponents.manifest b/components/captivedetect/CaptivePortalDetectComponents.manifest
index 490545c82..490545c82 100644
--- a/toolkit/components/captivedetect/CaptivePortalDetectComponents.manifest
+++ b/components/captivedetect/CaptivePortalDetectComponents.manifest
diff --git a/toolkit/components/captivedetect/captivedetect.js b/components/captivedetect/captivedetect.js
index 0e8c75981..0e8c75981 100644
--- a/toolkit/components/captivedetect/captivedetect.js
+++ b/components/captivedetect/captivedetect.js
diff --git a/toolkit/components/captivedetect/moz.build b/components/captivedetect/moz.build
index 73ed5043e..73ed5043e 100644
--- a/toolkit/components/captivedetect/moz.build
+++ b/components/captivedetect/moz.build
diff --git a/toolkit/components/captivedetect/nsICaptivePortalDetector.idl b/components/captivedetect/nsICaptivePortalDetector.idl
index 631685451..631685451 100644
--- a/toolkit/components/captivedetect/nsICaptivePortalDetector.idl
+++ b/components/captivedetect/nsICaptivePortalDetector.idl
diff --git a/toolkit/components/commandlines/moz.build b/components/commandlines/moz.build
index 92a4092d4..92a4092d4 100644
--- a/toolkit/components/commandlines/moz.build
+++ b/components/commandlines/moz.build
diff --git a/toolkit/components/commandlines/nsCommandLine.cpp b/components/commandlines/nsCommandLine.cpp
index 4f6257bef..4f6257bef 100644
--- a/toolkit/components/commandlines/nsCommandLine.cpp
+++ b/components/commandlines/nsCommandLine.cpp
diff --git a/toolkit/components/commandlines/nsICommandLine.idl b/components/commandlines/nsICommandLine.idl
index e44b3de9a..e44b3de9a 100644
--- a/toolkit/components/commandlines/nsICommandLine.idl
+++ b/components/commandlines/nsICommandLine.idl
diff --git a/toolkit/components/commandlines/nsICommandLineHandler.idl b/components/commandlines/nsICommandLineHandler.idl
index cd042d6a5..cd042d6a5 100644
--- a/toolkit/components/commandlines/nsICommandLineHandler.idl
+++ b/components/commandlines/nsICommandLineHandler.idl
diff --git a/toolkit/components/commandlines/nsICommandLineRunner.idl b/components/commandlines/nsICommandLineRunner.idl
index 0cd3f0c90..0cd3f0c90 100644
--- a/toolkit/components/commandlines/nsICommandLineRunner.idl
+++ b/components/commandlines/nsICommandLineRunner.idl
diff --git a/toolkit/components/commandlines/nsICommandLineValidator.idl b/components/commandlines/nsICommandLineValidator.idl
index eba949bf3..eba949bf3 100644
--- a/toolkit/components/commandlines/nsICommandLineValidator.idl
+++ b/components/commandlines/nsICommandLineValidator.idl
diff --git a/toolkit/components/console/content/console.css b/components/console/content/console.css
index e05f13c3e..e05f13c3e 100644
--- a/toolkit/components/console/content/console.css
+++ b/components/console/content/console.css
diff --git a/toolkit/components/console/content/console.js b/components/console/content/console.js
index ad6802607..ad6802607 100644
--- a/toolkit/components/console/content/console.js
+++ b/components/console/content/console.js
diff --git a/toolkit/components/console/content/console.xul b/components/console/content/console.xul
index 90b900cf9..90b900cf9 100644
--- a/toolkit/components/console/content/console.xul
+++ b/components/console/content/console.xul
diff --git a/toolkit/components/console/content/consoleBindings.xml b/components/console/content/consoleBindings.xml
index 1b00326bf..1b00326bf 100644
--- a/toolkit/components/console/content/consoleBindings.xml
+++ b/components/console/content/consoleBindings.xml
diff --git a/toolkit/components/console/jar.mn b/components/console/jar.mn
index 26e54c6fb..26e54c6fb 100644
--- a/toolkit/components/console/jar.mn
+++ b/components/console/jar.mn
diff --git a/toolkit/components/console/jsconsole-clhandler.js b/components/console/jsconsole-clhandler.js
index 1fff88890..1fff88890 100644
--- a/toolkit/components/console/jsconsole-clhandler.js
+++ b/components/console/jsconsole-clhandler.js
diff --git a/toolkit/components/console/jsconsole-clhandler.manifest b/components/console/jsconsole-clhandler.manifest
index 8e8c9b8bb..8e8c9b8bb 100644
--- a/toolkit/components/console/jsconsole-clhandler.manifest
+++ b/components/console/jsconsole-clhandler.manifest
diff --git a/toolkit/components/console/moz.build b/components/console/moz.build
index 43e3d8d02..43e3d8d02 100644
--- a/toolkit/components/console/moz.build
+++ b/components/console/moz.build
diff --git a/toolkit/components/contentprefs/ContentPrefInstance.jsm b/components/contentprefs/ContentPrefInstance.jsm
index 395569995..395569995 100644
--- a/toolkit/components/contentprefs/ContentPrefInstance.jsm
+++ b/components/contentprefs/ContentPrefInstance.jsm
diff --git a/toolkit/components/contentprefs/ContentPrefService2.jsm b/components/contentprefs/ContentPrefService2.jsm
index 87063d170..87063d170 100644
--- a/toolkit/components/contentprefs/ContentPrefService2.jsm
+++ b/components/contentprefs/ContentPrefService2.jsm
diff --git a/toolkit/components/contentprefs/ContentPrefServiceChild.jsm b/components/contentprefs/ContentPrefServiceChild.jsm
index af2a3c14b..af2a3c14b 100644
--- a/toolkit/components/contentprefs/ContentPrefServiceChild.jsm
+++ b/components/contentprefs/ContentPrefServiceChild.jsm
diff --git a/toolkit/components/contentprefs/ContentPrefServiceParent.jsm b/components/contentprefs/ContentPrefServiceParent.jsm
index 2b425c42f..2b425c42f 100644
--- a/toolkit/components/contentprefs/ContentPrefServiceParent.jsm
+++ b/components/contentprefs/ContentPrefServiceParent.jsm
diff --git a/toolkit/components/contentprefs/ContentPrefStore.jsm b/components/contentprefs/ContentPrefStore.jsm
index 7a552662f..7a552662f 100644
--- a/toolkit/components/contentprefs/ContentPrefStore.jsm
+++ b/components/contentprefs/ContentPrefStore.jsm
diff --git a/toolkit/components/contentprefs/ContentPrefUtils.jsm b/components/contentprefs/ContentPrefUtils.jsm
index 72c12e558..72c12e558 100644
--- a/toolkit/components/contentprefs/ContentPrefUtils.jsm
+++ b/components/contentprefs/ContentPrefUtils.jsm
diff --git a/toolkit/components/contentprefs/moz.build b/components/contentprefs/moz.build
index 0733f41b6..0733f41b6 100644
--- a/toolkit/components/contentprefs/moz.build
+++ b/components/contentprefs/moz.build
diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/components/contentprefs/nsContentPrefService.js
index 6360134a5..6360134a5 100644
--- a/toolkit/components/contentprefs/nsContentPrefService.js
+++ b/components/contentprefs/nsContentPrefService.js
diff --git a/toolkit/components/contentprefs/nsContentPrefService.manifest b/components/contentprefs/nsContentPrefService.manifest
index b6bc15721..b6bc15721 100644
--- a/toolkit/components/contentprefs/nsContentPrefService.manifest
+++ b/components/contentprefs/nsContentPrefService.manifest
diff --git a/toolkit/components/cookie/content/cookieAcceptDialog.js b/components/cookie/content/cookieAcceptDialog.js
index 5f5760305..5f5760305 100644
--- a/toolkit/components/cookie/content/cookieAcceptDialog.js
+++ b/components/cookie/content/cookieAcceptDialog.js
diff --git a/toolkit/components/cookie/content/cookieAcceptDialog.xul b/components/cookie/content/cookieAcceptDialog.xul
index 99fd92c0c..99fd92c0c 100644
--- a/toolkit/components/cookie/content/cookieAcceptDialog.xul
+++ b/components/cookie/content/cookieAcceptDialog.xul
diff --git a/toolkit/components/cookie/jar.mn b/components/cookie/jar.mn
index 2826bbcd6..2826bbcd6 100644
--- a/toolkit/components/cookie/jar.mn
+++ b/components/cookie/jar.mn
diff --git a/toolkit/components/cookie/locale/cookieAcceptDialog.dtd b/components/cookie/locale/cookieAcceptDialog.dtd
index 52664f1de..52664f1de 100644
--- a/toolkit/components/cookie/locale/cookieAcceptDialog.dtd
+++ b/components/cookie/locale/cookieAcceptDialog.dtd
diff --git a/toolkit/components/cookie/locale/cookieAcceptDialog.properties b/components/cookie/locale/cookieAcceptDialog.properties
index 698c6f010..698c6f010 100644
--- a/toolkit/components/cookie/locale/cookieAcceptDialog.properties
+++ b/components/cookie/locale/cookieAcceptDialog.properties
diff --git a/toolkit/components/cookie/moz.build b/components/cookie/moz.build
index aee4b90a5..aee4b90a5 100644
--- a/toolkit/components/cookie/moz.build
+++ b/components/cookie/moz.build
diff --git a/toolkit/components/crashes/CrashManager.jsm b/components/crashes/CrashManager.jsm
index 537ab328d..537ab328d 100644
--- a/toolkit/components/crashes/CrashManager.jsm
+++ b/components/crashes/CrashManager.jsm
diff --git a/toolkit/components/crashes/CrashManagerTest.jsm b/components/crashes/CrashManagerTest.jsm
index 2c6c4b1a0..2c6c4b1a0 100644
--- a/toolkit/components/crashes/CrashManagerTest.jsm
+++ b/components/crashes/CrashManagerTest.jsm
diff --git a/toolkit/components/crashes/CrashService.js b/components/crashes/CrashService.js
index 56f8b69e7..56f8b69e7 100644
--- a/toolkit/components/crashes/CrashService.js
+++ b/components/crashes/CrashService.js
diff --git a/toolkit/components/crashes/CrashService.manifest b/components/crashes/CrashService.manifest
index ed45109fe..ed45109fe 100644
--- a/toolkit/components/crashes/CrashService.manifest
+++ b/components/crashes/CrashService.manifest
diff --git a/toolkit/components/crashes/docs/crash-events.rst b/components/crashes/docs/crash-events.rst
index b29b27989..b29b27989 100644
--- a/toolkit/components/crashes/docs/crash-events.rst
+++ b/components/crashes/docs/crash-events.rst
diff --git a/toolkit/components/crashes/docs/index.rst b/components/crashes/docs/index.rst
index e2ab50ea4..e2ab50ea4 100644
--- a/toolkit/components/crashes/docs/index.rst
+++ b/components/crashes/docs/index.rst
diff --git a/toolkit/components/crashes/moz.build b/components/crashes/moz.build
index 25b70c875..25b70c875 100644
--- a/toolkit/components/crashes/moz.build
+++ b/components/crashes/moz.build
diff --git a/toolkit/components/crashes/nsICrashService.idl b/components/crashes/nsICrashService.idl
index 57a412804..57a412804 100644
--- a/toolkit/components/crashes/nsICrashService.idl
+++ b/components/crashes/nsICrashService.idl
diff --git a/toolkit/components/crashmonitor/CrashMonitor.jsm b/components/crashmonitor/CrashMonitor.jsm
index 34f4f26d1..34f4f26d1 100644
--- a/toolkit/components/crashmonitor/CrashMonitor.jsm
+++ b/components/crashmonitor/CrashMonitor.jsm
diff --git a/toolkit/components/crashmonitor/crashmonitor.manifest b/components/crashmonitor/crashmonitor.manifest
index 59e336f82..59e336f82 100644
--- a/toolkit/components/crashmonitor/crashmonitor.manifest
+++ b/components/crashmonitor/crashmonitor.manifest
diff --git a/toolkit/components/crashmonitor/moz.build b/components/crashmonitor/moz.build
index 0f85aa85b..0f85aa85b 100644
--- a/toolkit/components/crashmonitor/moz.build
+++ b/components/crashmonitor/moz.build
diff --git a/toolkit/components/crashmonitor/nsCrashMonitor.js b/components/crashmonitor/nsCrashMonitor.js
index 41e0dc901..41e0dc901 100644
--- a/toolkit/components/crashmonitor/nsCrashMonitor.js
+++ b/components/crashmonitor/nsCrashMonitor.js
diff --git a/toolkit/components/ctypes/ctypes.cpp b/components/ctypes/ctypes.cpp
index 249e26983..249e26983 100644
--- a/toolkit/components/ctypes/ctypes.cpp
+++ b/components/ctypes/ctypes.cpp
diff --git a/toolkit/components/ctypes/ctypes.h b/components/ctypes/ctypes.h
index b72f22c1c..b72f22c1c 100644
--- a/toolkit/components/ctypes/ctypes.h
+++ b/components/ctypes/ctypes.h
diff --git a/toolkit/components/ctypes/ctypes.jsm b/components/ctypes/ctypes.jsm
index f22d01184..f22d01184 100644
--- a/toolkit/components/ctypes/ctypes.jsm
+++ b/components/ctypes/ctypes.jsm
diff --git a/toolkit/components/ctypes/moz.build b/components/ctypes/moz.build
index 9ee1e48c6..9ee1e48c6 100644
--- a/toolkit/components/ctypes/moz.build
+++ b/components/ctypes/moz.build
diff --git a/toolkit/components/downloads/content/DownloadProgressListener.js b/components/downloads/content/DownloadProgressListener.js
index ab349baf2..ab349baf2 100644
--- a/toolkit/components/downloads/content/DownloadProgressListener.js
+++ b/components/downloads/content/DownloadProgressListener.js
diff --git a/toolkit/components/downloads/content/download.xml b/components/downloads/content/download.xml
index 1d4b87270..1d4b87270 100644
--- a/toolkit/components/downloads/content/download.xml
+++ b/components/downloads/content/download.xml
diff --git a/toolkit/components/downloads/content/downloads.css b/components/downloads/content/downloads.css
index dcb648d62..dcb648d62 100644
--- a/toolkit/components/downloads/content/downloads.css
+++ b/components/downloads/content/downloads.css
diff --git a/toolkit/components/downloads/content/downloads.js b/components/downloads/content/downloads.js
index 299717336..299717336 100644
--- a/toolkit/components/downloads/content/downloads.js
+++ b/components/downloads/content/downloads.js
diff --git a/toolkit/components/downloads/content/downloads.xul b/components/downloads/content/downloads.xul
index b5ca87a0c..b5ca87a0c 100644
--- a/toolkit/components/downloads/content/downloads.xul
+++ b/components/downloads/content/downloads.xul
diff --git a/toolkit/components/downloads/content/unknownContentType.xul b/components/downloads/content/unknownContentType.xul
index 42d356e9f..42d356e9f 100644
--- a/toolkit/components/downloads/content/unknownContentType.xul
+++ b/components/downloads/content/unknownContentType.xul
diff --git a/toolkit/components/downloads/jar.mn b/components/downloads/jar.mn
index e7974b707..e7974b707 100644
--- a/toolkit/components/downloads/jar.mn
+++ b/components/downloads/jar.mn
diff --git a/toolkit/components/downloads/locale/downloads.dtd b/components/downloads/locale/downloads.dtd
index 3c6373cfb..3c6373cfb 100644
--- a/toolkit/components/downloads/locale/downloads.dtd
+++ b/components/downloads/locale/downloads.dtd
diff --git a/toolkit/components/downloads/locale/downloads.properties b/components/downloads/locale/downloads.properties
index af95022f1..af95022f1 100644
--- a/toolkit/components/downloads/locale/downloads.properties
+++ b/components/downloads/locale/downloads.properties
diff --git a/toolkit/components/downloads/locale/settingsChange.dtd b/components/downloads/locale/settingsChange.dtd
index f28f7f341..f28f7f341 100644
--- a/toolkit/components/downloads/locale/settingsChange.dtd
+++ b/components/downloads/locale/settingsChange.dtd
diff --git a/toolkit/components/downloads/locale/unknownContentType.dtd b/components/downloads/locale/unknownContentType.dtd
index e0fbf7368..e0fbf7368 100644
--- a/toolkit/components/downloads/locale/unknownContentType.dtd
+++ b/components/downloads/locale/unknownContentType.dtd
diff --git a/toolkit/components/downloads/locale/unknownContentType.properties b/components/downloads/locale/unknownContentType.properties
index e599133ce..e599133ce 100644
--- a/toolkit/components/downloads/locale/unknownContentType.properties
+++ b/components/downloads/locale/unknownContentType.properties
diff --git a/toolkit/components/downloads/moz.build b/components/downloads/moz.build
index ffd526570..ffd526570 100644
--- a/toolkit/components/downloads/moz.build
+++ b/components/downloads/moz.build
diff --git a/toolkit/components/downloads/nsDownloadManagerUI.manifest b/components/downloads/nsDownloadManagerUI.manifest
index 4073c23fb..4073c23fb 100644
--- a/toolkit/components/downloads/nsDownloadManagerUI.manifest
+++ b/components/downloads/nsDownloadManagerUI.manifest
diff --git a/toolkit/components/downloads/nsHelperAppDlg.manifest b/components/downloads/nsHelperAppDlg.manifest
index 8824b45a2..8824b45a2 100644
--- a/toolkit/components/downloads/nsHelperAppDlg.manifest
+++ b/components/downloads/nsHelperAppDlg.manifest
diff --git a/toolkit/components/downloads/public/nsIDownload.idl b/components/downloads/public/nsIDownload.idl
index 47eb48780..47eb48780 100644
--- a/toolkit/components/downloads/public/nsIDownload.idl
+++ b/components/downloads/public/nsIDownload.idl
diff --git a/toolkit/components/downloads/public/nsIDownloadManager.idl b/components/downloads/public/nsIDownloadManager.idl
index d7eba8940..d7eba8940 100644
--- a/toolkit/components/downloads/public/nsIDownloadManager.idl
+++ b/components/downloads/public/nsIDownloadManager.idl
diff --git a/toolkit/components/downloads/public/nsIDownloadManagerUI.idl b/components/downloads/public/nsIDownloadManagerUI.idl
index b5ceff5b0..b5ceff5b0 100644
--- a/toolkit/components/downloads/public/nsIDownloadManagerUI.idl
+++ b/components/downloads/public/nsIDownloadManagerUI.idl
diff --git a/toolkit/components/downloads/public/nsIDownloadProgressListener.idl b/components/downloads/public/nsIDownloadProgressListener.idl
index e406f64d6..e406f64d6 100644
--- a/toolkit/components/downloads/public/nsIDownloadProgressListener.idl
+++ b/components/downloads/public/nsIDownloadProgressListener.idl
diff --git a/toolkit/components/downloads/src/DownloadLastDir.jsm b/components/downloads/src/DownloadLastDir.jsm
index 552fd3ef1..552fd3ef1 100644
--- a/toolkit/components/downloads/src/DownloadLastDir.jsm
+++ b/components/downloads/src/DownloadLastDir.jsm
diff --git a/toolkit/components/downloads/src/DownloadPaths.jsm b/components/downloads/src/DownloadPaths.jsm
index 202e42487..202e42487 100644
--- a/toolkit/components/downloads/src/DownloadPaths.jsm
+++ b/components/downloads/src/DownloadPaths.jsm
diff --git a/toolkit/components/downloads/src/DownloadTaskbarProgress.jsm b/components/downloads/src/DownloadTaskbarProgress.jsm
index 0264005e0..0264005e0 100644
--- a/toolkit/components/downloads/src/DownloadTaskbarProgress.jsm
+++ b/components/downloads/src/DownloadTaskbarProgress.jsm
diff --git a/toolkit/components/downloads/src/DownloadUtils.jsm b/components/downloads/src/DownloadUtils.jsm
index 3ebdd605e..3ebdd605e 100644
--- a/toolkit/components/downloads/src/DownloadUtils.jsm
+++ b/components/downloads/src/DownloadUtils.jsm
diff --git a/toolkit/components/downloads/src/SQLFunctions.cpp b/components/downloads/src/SQLFunctions.cpp
index 8f2d3e77b..8f2d3e77b 100644
--- a/toolkit/components/downloads/src/SQLFunctions.cpp
+++ b/components/downloads/src/SQLFunctions.cpp
diff --git a/toolkit/components/downloads/src/SQLFunctions.h b/components/downloads/src/SQLFunctions.h
index ae207788c..ae207788c 100644
--- a/toolkit/components/downloads/src/SQLFunctions.h
+++ b/components/downloads/src/SQLFunctions.h
diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/components/downloads/src/nsDownloadManager.cpp
index bc01b9ae5..bc01b9ae5 100644
--- a/toolkit/components/downloads/src/nsDownloadManager.cpp
+++ b/components/downloads/src/nsDownloadManager.cpp
diff --git a/toolkit/components/downloads/src/nsDownloadManager.h b/components/downloads/src/nsDownloadManager.h
index 566e3560a..566e3560a 100644
--- a/toolkit/components/downloads/src/nsDownloadManager.h
+++ b/components/downloads/src/nsDownloadManager.h
diff --git a/toolkit/components/downloads/src/nsDownloadManagerUI.js b/components/downloads/src/nsDownloadManagerUI.js
index 11e241403..11e241403 100644
--- a/toolkit/components/downloads/src/nsDownloadManagerUI.js
+++ b/components/downloads/src/nsDownloadManagerUI.js
diff --git a/toolkit/components/downloads/src/nsDownloadProxy.h b/components/downloads/src/nsDownloadProxy.h
index ca48c9dad..ca48c9dad 100644
--- a/toolkit/components/downloads/src/nsDownloadProxy.h
+++ b/components/downloads/src/nsDownloadProxy.h
diff --git a/toolkit/components/downloads/src/nsDownloadScanner.cpp b/components/downloads/src/nsDownloadScanner.cpp
index 1ef5b3660..1ef5b3660 100644
--- a/toolkit/components/downloads/src/nsDownloadScanner.cpp
+++ b/components/downloads/src/nsDownloadScanner.cpp
diff --git a/toolkit/components/downloads/src/nsDownloadScanner.h b/components/downloads/src/nsDownloadScanner.h
index 3301489fe..3301489fe 100644
--- a/toolkit/components/downloads/src/nsDownloadScanner.h
+++ b/components/downloads/src/nsDownloadScanner.h
diff --git a/toolkit/components/downloads/src/nsHelperAppDlg.js b/components/downloads/src/nsHelperAppDlg.js
index 0e5cfdaf0..0e5cfdaf0 100644
--- a/toolkit/components/downloads/src/nsHelperAppDlg.js
+++ b/components/downloads/src/nsHelperAppDlg.js
diff --git a/toolkit/components/extensions/content/OpenH264-license.txt b/components/extensions/content/OpenH264-license.txt
index ad37989b8..ad37989b8 100644
--- a/toolkit/components/extensions/content/OpenH264-license.txt
+++ b/components/extensions/content/OpenH264-license.txt
diff --git a/toolkit/components/extensions/content/about.js b/components/extensions/content/about.js
index 49ca4acc1..49ca4acc1 100644
--- a/toolkit/components/extensions/content/about.js
+++ b/components/extensions/content/about.js
diff --git a/toolkit/components/extensions/content/about.xul b/components/extensions/content/about.xul
index 6effcf37a..6effcf37a 100644
--- a/toolkit/components/extensions/content/about.xul
+++ b/components/extensions/content/about.xul
diff --git a/toolkit/components/extensions/content/blocklist.css b/components/extensions/content/blocklist.css
index cb48005a2..cb48005a2 100644
--- a/toolkit/components/extensions/content/blocklist.css
+++ b/components/extensions/content/blocklist.css
diff --git a/toolkit/components/extensions/content/blocklist.js b/components/extensions/content/blocklist.js
index 6d524e6ee..6d524e6ee 100644
--- a/toolkit/components/extensions/content/blocklist.js
+++ b/components/extensions/content/blocklist.js
diff --git a/toolkit/components/extensions/content/blocklist.xml b/components/extensions/content/blocklist.xml
index 74474392f..74474392f 100644
--- a/toolkit/components/extensions/content/blocklist.xml
+++ b/components/extensions/content/blocklist.xml
diff --git a/toolkit/components/extensions/content/blocklist.xul b/components/extensions/content/blocklist.xul
index 240d9e4e1..240d9e4e1 100644
--- a/toolkit/components/extensions/content/blocklist.xul
+++ b/components/extensions/content/blocklist.xul
diff --git a/toolkit/components/extensions/content/eula.js b/components/extensions/content/eula.js
index a05f7fe1c..a05f7fe1c 100644
--- a/toolkit/components/extensions/content/eula.js
+++ b/components/extensions/content/eula.js
diff --git a/toolkit/components/extensions/content/eula.xul b/components/extensions/content/eula.xul
index 10e657951..10e657951 100644
--- a/toolkit/components/extensions/content/eula.xul
+++ b/components/extensions/content/eula.xul
diff --git a/toolkit/components/extensions/content/extensions.css b/components/extensions/content/extensions.css
index 51828d544..51828d544 100644
--- a/toolkit/components/extensions/content/extensions.css
+++ b/components/extensions/content/extensions.css
diff --git a/toolkit/components/extensions/content/extensions.js b/components/extensions/content/extensions.js
index fe84bc460..fe84bc460 100644
--- a/toolkit/components/extensions/content/extensions.js
+++ b/components/extensions/content/extensions.js
diff --git a/toolkit/components/extensions/content/extensions.xml b/components/extensions/content/extensions.xml
index a3246e220..a3246e220 100644
--- a/toolkit/components/extensions/content/extensions.xml
+++ b/components/extensions/content/extensions.xml
diff --git a/toolkit/components/extensions/content/extensions.xul b/components/extensions/content/extensions.xul
index 70ce55fa2..70ce55fa2 100644
--- a/toolkit/components/extensions/content/extensions.xul
+++ b/components/extensions/content/extensions.xul
diff --git a/toolkit/components/extensions/content/gmpPrefs.xul b/components/extensions/content/gmpPrefs.xul
index ea7ee92fa..ea7ee92fa 100644
--- a/toolkit/components/extensions/content/gmpPrefs.xul
+++ b/components/extensions/content/gmpPrefs.xul
diff --git a/toolkit/components/extensions/content/list.js b/components/extensions/content/list.js
index a31922703..a31922703 100644
--- a/toolkit/components/extensions/content/list.js
+++ b/components/extensions/content/list.js
diff --git a/toolkit/components/extensions/content/list.xul b/components/extensions/content/list.xul
index 65efeb6a2..65efeb6a2 100644
--- a/toolkit/components/extensions/content/list.xul
+++ b/components/extensions/content/list.xul
diff --git a/toolkit/components/extensions/content/newaddon.js b/components/extensions/content/newaddon.js
index aab556a62..aab556a62 100644
--- a/toolkit/components/extensions/content/newaddon.js
+++ b/components/extensions/content/newaddon.js
diff --git a/toolkit/components/extensions/content/newaddon.xul b/components/extensions/content/newaddon.xul
index 0806f2799..0806f2799 100644
--- a/toolkit/components/extensions/content/newaddon.xul
+++ b/components/extensions/content/newaddon.xul
diff --git a/toolkit/components/extensions/content/pluginPrefs.xul b/components/extensions/content/pluginPrefs.xul
index c3fdbfa5b..c3fdbfa5b 100644
--- a/toolkit/components/extensions/content/pluginPrefs.xul
+++ b/components/extensions/content/pluginPrefs.xul
diff --git a/toolkit/components/extensions/content/selectAddons.css b/components/extensions/content/selectAddons.css
index 636757721..636757721 100644
--- a/toolkit/components/extensions/content/selectAddons.css
+++ b/components/extensions/content/selectAddons.css
diff --git a/toolkit/components/extensions/content/selectAddons.js b/components/extensions/content/selectAddons.js
index 01b9030ee..01b9030ee 100644
--- a/toolkit/components/extensions/content/selectAddons.js
+++ b/components/extensions/content/selectAddons.js
diff --git a/toolkit/components/extensions/content/selectAddons.xml b/components/extensions/content/selectAddons.xml
index dbfc0d400..dbfc0d400 100644
--- a/toolkit/components/extensions/content/selectAddons.xml
+++ b/components/extensions/content/selectAddons.xml
diff --git a/toolkit/components/extensions/content/selectAddons.xul b/components/extensions/content/selectAddons.xul
index 0fa292ecf..0fa292ecf 100644
--- a/toolkit/components/extensions/content/selectAddons.xul
+++ b/components/extensions/content/selectAddons.xul
diff --git a/toolkit/components/extensions/content/setting.xml b/components/extensions/content/setting.xml
index c4eae1fd3..c4eae1fd3 100644
--- a/toolkit/components/extensions/content/setting.xml
+++ b/components/extensions/content/setting.xml
diff --git a/toolkit/components/extensions/content/update.js b/components/extensions/content/update.js
index 98495b426..98495b426 100644
--- a/toolkit/components/extensions/content/update.js
+++ b/components/extensions/content/update.js
diff --git a/toolkit/components/extensions/content/update.xul b/components/extensions/content/update.xul
index 9f5f35196..9f5f35196 100644
--- a/toolkit/components/extensions/content/update.xul
+++ b/components/extensions/content/update.xul
diff --git a/toolkit/components/extensions/content/updateinfo.xsl b/components/extensions/content/updateinfo.xsl
index 5fcccd6d7..5fcccd6d7 100644
--- a/toolkit/components/extensions/content/updateinfo.xsl
+++ b/components/extensions/content/updateinfo.xsl
diff --git a/toolkit/components/extensions/content/xpinstallConfirm.css b/components/extensions/content/xpinstallConfirm.css
index 583facfec..583facfec 100644
--- a/toolkit/components/extensions/content/xpinstallConfirm.css
+++ b/components/extensions/content/xpinstallConfirm.css
diff --git a/toolkit/components/extensions/content/xpinstallConfirm.js b/components/extensions/content/xpinstallConfirm.js
index 29be5f5e9..29be5f5e9 100644
--- a/toolkit/components/extensions/content/xpinstallConfirm.js
+++ b/components/extensions/content/xpinstallConfirm.js
diff --git a/toolkit/components/extensions/content/xpinstallConfirm.xul b/components/extensions/content/xpinstallConfirm.xul
index f1c29eb73..f1c29eb73 100644
--- a/toolkit/components/extensions/content/xpinstallConfirm.xul
+++ b/components/extensions/content/xpinstallConfirm.xul
diff --git a/toolkit/components/extensions/content/xpinstallItem.xml b/components/extensions/content/xpinstallItem.xml
index 5146af84f..5146af84f 100644
--- a/toolkit/components/extensions/content/xpinstallItem.xml
+++ b/components/extensions/content/xpinstallItem.xml
diff --git a/toolkit/components/extensions/extensions.manifest b/components/extensions/extensions.manifest
index b56152e10..b56152e10 100644
--- a/toolkit/components/extensions/extensions.manifest
+++ b/components/extensions/extensions.manifest
diff --git a/toolkit/components/extensions/jar.mn b/components/extensions/jar.mn
index 878be4df1..878be4df1 100644
--- a/toolkit/components/extensions/jar.mn
+++ b/components/extensions/jar.mn
diff --git a/toolkit/components/extensions/locale/about.dtd b/components/extensions/locale/about.dtd
index 4f9098966..4f9098966 100644
--- a/toolkit/components/extensions/locale/about.dtd
+++ b/components/extensions/locale/about.dtd
diff --git a/toolkit/components/extensions/locale/blocklist.dtd b/components/extensions/locale/blocklist.dtd
index a9490db5e..a9490db5e 100644
--- a/toolkit/components/extensions/locale/blocklist.dtd
+++ b/components/extensions/locale/blocklist.dtd
diff --git a/toolkit/components/extensions/locale/extensions.dtd b/components/extensions/locale/extensions.dtd
index 098896d99..098896d99 100644
--- a/toolkit/components/extensions/locale/extensions.dtd
+++ b/components/extensions/locale/extensions.dtd
diff --git a/toolkit/components/extensions/locale/extensions.properties b/components/extensions/locale/extensions.properties
index 370198f56..370198f56 100644
--- a/toolkit/components/extensions/locale/extensions.properties
+++ b/components/extensions/locale/extensions.properties
diff --git a/toolkit/components/extensions/locale/newaddon.dtd b/components/extensions/locale/newaddon.dtd
index 1307cebb9..1307cebb9 100644
--- a/toolkit/components/extensions/locale/newaddon.dtd
+++ b/components/extensions/locale/newaddon.dtd
diff --git a/toolkit/components/extensions/locale/newaddon.properties b/components/extensions/locale/newaddon.properties
index bd5997a26..bd5997a26 100644
--- a/toolkit/components/extensions/locale/newaddon.properties
+++ b/components/extensions/locale/newaddon.properties
diff --git a/toolkit/components/extensions/locale/selectAddons.dtd b/components/extensions/locale/selectAddons.dtd
index 2f6f1cd57..2f6f1cd57 100644
--- a/toolkit/components/extensions/locale/selectAddons.dtd
+++ b/components/extensions/locale/selectAddons.dtd
diff --git a/toolkit/components/extensions/locale/selectAddons.properties b/components/extensions/locale/selectAddons.properties
index 2824758d6..2824758d6 100644
--- a/toolkit/components/extensions/locale/selectAddons.properties
+++ b/components/extensions/locale/selectAddons.properties
diff --git a/toolkit/components/extensions/locale/update.dtd b/components/extensions/locale/update.dtd
index 6c820e088..6c820e088 100644
--- a/toolkit/components/extensions/locale/update.dtd
+++ b/components/extensions/locale/update.dtd
diff --git a/toolkit/components/extensions/locale/update.properties b/components/extensions/locale/update.properties
index 7cf79f9c1..7cf79f9c1 100644
--- a/toolkit/components/extensions/locale/update.properties
+++ b/components/extensions/locale/update.properties
diff --git a/toolkit/components/extensions/locale/xpinstallConfirm.dtd b/components/extensions/locale/xpinstallConfirm.dtd
index 6a7d17a16..6a7d17a16 100644
--- a/toolkit/components/extensions/locale/xpinstallConfirm.dtd
+++ b/components/extensions/locale/xpinstallConfirm.dtd
diff --git a/toolkit/components/extensions/locale/xpinstallConfirm.properties b/components/extensions/locale/xpinstallConfirm.properties
index b538e9e90..b538e9e90 100644
--- a/toolkit/components/extensions/locale/xpinstallConfirm.properties
+++ b/components/extensions/locale/xpinstallConfirm.properties
diff --git a/toolkit/components/extensions/moz.build b/components/extensions/moz.build
index 6b1e2fe93..6b1e2fe93 100644
--- a/toolkit/components/extensions/moz.build
+++ b/components/extensions/moz.build
diff --git a/toolkit/components/extensions/public/amIAddonManager.idl b/components/extensions/public/amIAddonManager.idl
index 58a58b62d..58a58b62d 100644
--- a/toolkit/components/extensions/public/amIAddonManager.idl
+++ b/components/extensions/public/amIAddonManager.idl
diff --git a/toolkit/components/extensions/public/amIAddonPathService.idl b/components/extensions/public/amIAddonPathService.idl
index 9c9197a61..9c9197a61 100644
--- a/toolkit/components/extensions/public/amIAddonPathService.idl
+++ b/components/extensions/public/amIAddonPathService.idl
diff --git a/toolkit/components/extensions/public/amIWebInstallListener.idl b/components/extensions/public/amIWebInstallListener.idl
index eed108097..eed108097 100644
--- a/toolkit/components/extensions/public/amIWebInstallListener.idl
+++ b/components/extensions/public/amIWebInstallListener.idl
diff --git a/toolkit/components/extensions/public/amIWebInstaller.idl b/components/extensions/public/amIWebInstaller.idl
index 6c5ebca67..6c5ebca67 100644
--- a/toolkit/components/extensions/public/amIWebInstaller.idl
+++ b/components/extensions/public/amIWebInstaller.idl
diff --git a/toolkit/components/extensions/src/AddonLogging.jsm b/components/extensions/src/AddonLogging.jsm
index ffa92c791..ffa92c791 100644
--- a/toolkit/components/extensions/src/AddonLogging.jsm
+++ b/components/extensions/src/AddonLogging.jsm
diff --git a/toolkit/components/extensions/src/AddonManager.jsm b/components/extensions/src/AddonManager.jsm
index aef5c6acb..aef5c6acb 100644
--- a/toolkit/components/extensions/src/AddonManager.jsm
+++ b/components/extensions/src/AddonManager.jsm
diff --git a/toolkit/components/extensions/src/AddonPathService.cpp b/components/extensions/src/AddonPathService.cpp
index ddfdbe817..ddfdbe817 100644
--- a/toolkit/components/extensions/src/AddonPathService.cpp
+++ b/components/extensions/src/AddonPathService.cpp
diff --git a/toolkit/components/extensions/src/AddonPathService.h b/components/extensions/src/AddonPathService.h
index f739b018f..f739b018f 100644
--- a/toolkit/components/extensions/src/AddonPathService.h
+++ b/components/extensions/src/AddonPathService.h
diff --git a/toolkit/components/extensions/src/AddonRepository.jsm b/components/extensions/src/AddonRepository.jsm
index 41fb5c06d..41fb5c06d 100644
--- a/toolkit/components/extensions/src/AddonRepository.jsm
+++ b/components/extensions/src/AddonRepository.jsm
diff --git a/toolkit/components/extensions/src/AddonRepository_SQLiteMigrator.jsm b/components/extensions/src/AddonRepository_SQLiteMigrator.jsm
index 66147b9aa..66147b9aa 100644
--- a/toolkit/components/extensions/src/AddonRepository_SQLiteMigrator.jsm
+++ b/components/extensions/src/AddonRepository_SQLiteMigrator.jsm
diff --git a/toolkit/components/extensions/src/AddonUpdateChecker.jsm b/components/extensions/src/AddonUpdateChecker.jsm
index 4fce84095..4fce84095 100644
--- a/toolkit/components/extensions/src/AddonUpdateChecker.jsm
+++ b/components/extensions/src/AddonUpdateChecker.jsm
diff --git a/toolkit/components/extensions/src/ChromeManifestParser.jsm b/components/extensions/src/ChromeManifestParser.jsm
index 63f1db785..63f1db785 100644
--- a/toolkit/components/extensions/src/ChromeManifestParser.jsm
+++ b/components/extensions/src/ChromeManifestParser.jsm
diff --git a/toolkit/components/extensions/src/Content.js b/components/extensions/src/Content.js
index 9f366ba32..9f366ba32 100644
--- a/toolkit/components/extensions/src/Content.js
+++ b/components/extensions/src/Content.js
diff --git a/toolkit/components/extensions/src/DeferredSave.jsm b/components/extensions/src/DeferredSave.jsm
index f1537fe4b..f1537fe4b 100644
--- a/toolkit/components/extensions/src/DeferredSave.jsm
+++ b/components/extensions/src/DeferredSave.jsm
diff --git a/toolkit/components/extensions/src/GMPInstallManager.jsm b/components/extensions/src/GMPInstallManager.jsm
index fe4e2de10..fe4e2de10 100644
--- a/toolkit/components/extensions/src/GMPInstallManager.jsm
+++ b/components/extensions/src/GMPInstallManager.jsm
diff --git a/toolkit/components/extensions/src/GMPProvider.jsm b/components/extensions/src/GMPProvider.jsm
index c89427101..c89427101 100644
--- a/toolkit/components/extensions/src/GMPProvider.jsm
+++ b/components/extensions/src/GMPProvider.jsm
diff --git a/toolkit/components/extensions/src/GMPUtils.jsm b/components/extensions/src/GMPUtils.jsm
index 593fc3c8d..593fc3c8d 100644
--- a/toolkit/components/extensions/src/GMPUtils.jsm
+++ b/components/extensions/src/GMPUtils.jsm
diff --git a/toolkit/components/extensions/src/LightweightThemeConsumer.jsm b/components/extensions/src/LightweightThemeConsumer.jsm
index 9419fdcf2..9419fdcf2 100644
--- a/toolkit/components/extensions/src/LightweightThemeConsumer.jsm
+++ b/components/extensions/src/LightweightThemeConsumer.jsm
diff --git a/toolkit/components/extensions/src/LightweightThemeImageOptimizer.jsm b/components/extensions/src/LightweightThemeImageOptimizer.jsm
index a9201c3da..a9201c3da 100644
--- a/toolkit/components/extensions/src/LightweightThemeImageOptimizer.jsm
+++ b/components/extensions/src/LightweightThemeImageOptimizer.jsm
diff --git a/toolkit/components/extensions/src/LightweightThemeManager.jsm b/components/extensions/src/LightweightThemeManager.jsm
index a4cbf3833..a4cbf3833 100644
--- a/toolkit/components/extensions/src/LightweightThemeManager.jsm
+++ b/components/extensions/src/LightweightThemeManager.jsm
diff --git a/toolkit/components/extensions/src/PluginProvider.jsm b/components/extensions/src/PluginProvider.jsm
index cb07dcb12..cb07dcb12 100644
--- a/toolkit/components/extensions/src/PluginProvider.jsm
+++ b/components/extensions/src/PluginProvider.jsm
diff --git a/toolkit/components/extensions/src/ProductAddonChecker.jsm b/components/extensions/src/ProductAddonChecker.jsm
index c6324da0a..c6324da0a 100644
--- a/toolkit/components/extensions/src/ProductAddonChecker.jsm
+++ b/components/extensions/src/ProductAddonChecker.jsm
diff --git a/toolkit/components/extensions/src/SpellCheckDictionaryBootstrap.js b/components/extensions/src/SpellCheckDictionaryBootstrap.js
index f4f557fc2..f4f557fc2 100644
--- a/toolkit/components/extensions/src/SpellCheckDictionaryBootstrap.js
+++ b/components/extensions/src/SpellCheckDictionaryBootstrap.js
diff --git a/toolkit/components/extensions/src/XPIProvider.jsm b/components/extensions/src/XPIProvider.jsm
index 01f2abc69..01f2abc69 100644
--- a/toolkit/components/extensions/src/XPIProvider.jsm
+++ b/components/extensions/src/XPIProvider.jsm
diff --git a/toolkit/components/extensions/src/XPIProviderUtils.js b/components/extensions/src/XPIProviderUtils.js
index 9f3273b1a..9f3273b1a 100644
--- a/toolkit/components/extensions/src/XPIProviderUtils.js
+++ b/components/extensions/src/XPIProviderUtils.js
diff --git a/toolkit/components/extensions/src/addonManager.js b/components/extensions/src/addonManager.js
index 2628ea87b..2628ea87b 100644
--- a/toolkit/components/extensions/src/addonManager.js
+++ b/components/extensions/src/addonManager.js
diff --git a/toolkit/components/extensions/src/amContentHandler.js b/components/extensions/src/amContentHandler.js
index 8dc4dfecd..8dc4dfecd 100644
--- a/toolkit/components/extensions/src/amContentHandler.js
+++ b/components/extensions/src/amContentHandler.js
diff --git a/toolkit/components/extensions/src/amInstallTrigger.js b/components/extensions/src/amInstallTrigger.js
index 5fc0e1717..5fc0e1717 100644
--- a/toolkit/components/extensions/src/amInstallTrigger.js
+++ b/components/extensions/src/amInstallTrigger.js
diff --git a/toolkit/components/extensions/src/amWebInstallListener.js b/components/extensions/src/amWebInstallListener.js
index 9b9c53f44..9b9c53f44 100644
--- a/toolkit/components/extensions/src/amWebInstallListener.js
+++ b/components/extensions/src/amWebInstallListener.js
diff --git a/toolkit/components/exthelper/extApplication.js b/components/exthelper/extApplication.js
index a56a04c0e..a56a04c0e 100644
--- a/toolkit/components/exthelper/extApplication.js
+++ b/components/exthelper/extApplication.js
diff --git a/toolkit/components/exthelper/extIApplication.idl b/components/exthelper/extIApplication.idl
index 51c17b436..51c17b436 100644
--- a/toolkit/components/exthelper/extIApplication.idl
+++ b/components/exthelper/extIApplication.idl
diff --git a/toolkit/components/exthelper/moz.build b/components/exthelper/moz.build
index 784d2761e..784d2761e 100644
--- a/toolkit/components/exthelper/moz.build
+++ b/components/exthelper/moz.build
diff --git a/toolkit/components/feeds/FeedProcessor.js b/components/feeds/FeedProcessor.js
index 51b6b13c9..51b6b13c9 100644
--- a/toolkit/components/feeds/FeedProcessor.js
+++ b/components/feeds/FeedProcessor.js
diff --git a/toolkit/components/feeds/FeedProcessor.manifest b/components/feeds/FeedProcessor.manifest
index 5081d70c5..5081d70c5 100644
--- a/toolkit/components/feeds/FeedProcessor.manifest
+++ b/components/feeds/FeedProcessor.manifest
diff --git a/toolkit/components/feeds/moz.build b/components/feeds/moz.build
index 7ae10d0a3..7ae10d0a3 100644
--- a/toolkit/components/feeds/moz.build
+++ b/components/feeds/moz.build
diff --git a/toolkit/components/feeds/nsIFeed.idl b/components/feeds/nsIFeed.idl
index ad87ad9d3..ad87ad9d3 100644
--- a/toolkit/components/feeds/nsIFeed.idl
+++ b/components/feeds/nsIFeed.idl
diff --git a/toolkit/components/feeds/nsIFeedContainer.idl b/components/feeds/nsIFeedContainer.idl
index 58de494a5..58de494a5 100644
--- a/toolkit/components/feeds/nsIFeedContainer.idl
+++ b/components/feeds/nsIFeedContainer.idl
diff --git a/toolkit/components/feeds/nsIFeedElementBase.idl b/components/feeds/nsIFeedElementBase.idl
index 1b8975ae5..1b8975ae5 100644
--- a/toolkit/components/feeds/nsIFeedElementBase.idl
+++ b/components/feeds/nsIFeedElementBase.idl
diff --git a/toolkit/components/feeds/nsIFeedEntry.idl b/components/feeds/nsIFeedEntry.idl
index 83646aadb..83646aadb 100644
--- a/toolkit/components/feeds/nsIFeedEntry.idl
+++ b/components/feeds/nsIFeedEntry.idl
diff --git a/toolkit/components/feeds/nsIFeedGenerator.idl b/components/feeds/nsIFeedGenerator.idl
index 3c23ca142..3c23ca142 100644
--- a/toolkit/components/feeds/nsIFeedGenerator.idl
+++ b/components/feeds/nsIFeedGenerator.idl
diff --git a/toolkit/components/feeds/nsIFeedListener.idl b/components/feeds/nsIFeedListener.idl
index 6826d04a4..6826d04a4 100644
--- a/toolkit/components/feeds/nsIFeedListener.idl
+++ b/components/feeds/nsIFeedListener.idl
diff --git a/toolkit/components/feeds/nsIFeedPerson.idl b/components/feeds/nsIFeedPerson.idl
index d9d6eb77b..d9d6eb77b 100644
--- a/toolkit/components/feeds/nsIFeedPerson.idl
+++ b/components/feeds/nsIFeedPerson.idl
diff --git a/toolkit/components/feeds/nsIFeedProcessor.idl b/components/feeds/nsIFeedProcessor.idl
index d7205600d..d7205600d 100644
--- a/toolkit/components/feeds/nsIFeedProcessor.idl
+++ b/components/feeds/nsIFeedProcessor.idl
diff --git a/toolkit/components/feeds/nsIFeedResult.idl b/components/feeds/nsIFeedResult.idl
index 4cfb0a13e..4cfb0a13e 100644
--- a/toolkit/components/feeds/nsIFeedResult.idl
+++ b/components/feeds/nsIFeedResult.idl
diff --git a/toolkit/components/feeds/nsIFeedTextConstruct.idl b/components/feeds/nsIFeedTextConstruct.idl
index 070acb20a..070acb20a 100644
--- a/toolkit/components/feeds/nsIFeedTextConstruct.idl
+++ b/components/feeds/nsIFeedTextConstruct.idl
diff --git a/toolkit/components/filepicker/content/filepicker.js b/components/filepicker/content/filepicker.js
index 6f91066ba..6f91066ba 100644
--- a/toolkit/components/filepicker/content/filepicker.js
+++ b/components/filepicker/content/filepicker.js
diff --git a/toolkit/components/filepicker/content/filepicker.xul b/components/filepicker/content/filepicker.xul
index 4bf311230..4bf311230 100644
--- a/toolkit/components/filepicker/content/filepicker.xul
+++ b/components/filepicker/content/filepicker.xul
diff --git a/toolkit/components/filepicker/jar.mn b/components/filepicker/jar.mn
index ba585f3a4..ba585f3a4 100644
--- a/toolkit/components/filepicker/jar.mn
+++ b/components/filepicker/jar.mn
diff --git a/toolkit/components/filepicker/moz.build b/components/filepicker/moz.build
index 50c344dc5..50c344dc5 100644
--- a/toolkit/components/filepicker/moz.build
+++ b/components/filepicker/moz.build
diff --git a/toolkit/components/filepicker/nsFilePicker.js b/components/filepicker/nsFilePicker.js
index 8c92ff821..8c92ff821 100644
--- a/toolkit/components/filepicker/nsFilePicker.js
+++ b/components/filepicker/nsFilePicker.js
diff --git a/toolkit/components/filepicker/nsFilePicker.manifest b/components/filepicker/nsFilePicker.manifest
index 06c2e8956..06c2e8956 100644
--- a/toolkit/components/filepicker/nsFilePicker.manifest
+++ b/components/filepicker/nsFilePicker.manifest
diff --git a/toolkit/components/filepicker/nsFileView.cpp b/components/filepicker/nsFileView.cpp
index 9a8278496..9a8278496 100644
--- a/toolkit/components/filepicker/nsFileView.cpp
+++ b/components/filepicker/nsFileView.cpp
diff --git a/toolkit/components/filepicker/nsIFileView.idl b/components/filepicker/nsIFileView.idl
index 4862a594e..4862a594e 100644
--- a/toolkit/components/filepicker/nsIFileView.idl
+++ b/components/filepicker/nsIFileView.idl
diff --git a/toolkit/components/filewatcher/NativeFileWatcherNotSupported.h b/components/filewatcher/NativeFileWatcherNotSupported.h
index 6b1aa97ba..6b1aa97ba 100644
--- a/toolkit/components/filewatcher/NativeFileWatcherNotSupported.h
+++ b/components/filewatcher/NativeFileWatcherNotSupported.h
diff --git a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp b/components/filewatcher/NativeFileWatcherWin.cpp
index 1e5bcf9e7..1e5bcf9e7 100644
--- a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
+++ b/components/filewatcher/NativeFileWatcherWin.cpp
diff --git a/toolkit/components/filewatcher/NativeFileWatcherWin.h b/components/filewatcher/NativeFileWatcherWin.h
index 37dd97f84..37dd97f84 100644
--- a/toolkit/components/filewatcher/NativeFileWatcherWin.h
+++ b/components/filewatcher/NativeFileWatcherWin.h
diff --git a/toolkit/components/filewatcher/moz.build b/components/filewatcher/moz.build
index 5fb1c4570..5fb1c4570 100644
--- a/toolkit/components/filewatcher/moz.build
+++ b/components/filewatcher/moz.build
diff --git a/toolkit/components/filewatcher/nsINativeFileWatcher.idl b/components/filewatcher/nsINativeFileWatcher.idl
index e2e5d2fe1..e2e5d2fe1 100644
--- a/toolkit/components/filewatcher/nsINativeFileWatcher.idl
+++ b/components/filewatcher/nsINativeFileWatcher.idl
diff --git a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp b/components/finalizationwitness/FinalizationWitnessService.cpp
index 0cf4ae52e..0cf4ae52e 100644
--- a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
+++ b/components/finalizationwitness/FinalizationWitnessService.cpp
diff --git a/toolkit/components/finalizationwitness/FinalizationWitnessService.h b/components/finalizationwitness/FinalizationWitnessService.h
index 087cff239..087cff239 100644
--- a/toolkit/components/finalizationwitness/FinalizationWitnessService.h
+++ b/components/finalizationwitness/FinalizationWitnessService.h
diff --git a/toolkit/components/finalizationwitness/moz.build b/components/finalizationwitness/moz.build
index 4e734992f..4e734992f 100644
--- a/toolkit/components/finalizationwitness/moz.build
+++ b/components/finalizationwitness/moz.build
diff --git a/toolkit/components/finalizationwitness/nsIFinalizationWitnessService.idl b/components/finalizationwitness/nsIFinalizationWitnessService.idl
index 6fc071e02..6fc071e02 100644
--- a/toolkit/components/finalizationwitness/nsIFinalizationWitnessService.idl
+++ b/components/finalizationwitness/nsIFinalizationWitnessService.idl
diff --git a/toolkit/components/find/moz.build b/components/find/moz.build
index de83e39c3..de83e39c3 100644
--- a/toolkit/components/find/moz.build
+++ b/components/find/moz.build
diff --git a/toolkit/components/find/nsFindService.cpp b/components/find/nsFindService.cpp
index 3e80823ce..3e80823ce 100644
--- a/toolkit/components/find/nsFindService.cpp
+++ b/components/find/nsFindService.cpp
diff --git a/toolkit/components/find/nsFindService.h b/components/find/nsFindService.h
index 6b391d5bf..6b391d5bf 100644
--- a/toolkit/components/find/nsFindService.h
+++ b/components/find/nsFindService.h
diff --git a/toolkit/components/find/nsIFindService.idl b/components/find/nsIFindService.idl
index c5fb96f76..c5fb96f76 100644
--- a/toolkit/components/find/nsIFindService.idl
+++ b/components/find/nsIFindService.idl
diff --git a/toolkit/components/formautofill/content/requestAutocomplete.js b/components/formautofill/content/requestAutocomplete.js
index 47d500964..47d500964 100644
--- a/toolkit/components/formautofill/content/requestAutocomplete.js
+++ b/components/formautofill/content/requestAutocomplete.js
diff --git a/toolkit/components/formautofill/content/requestAutocomplete.xhtml b/components/formautofill/content/requestAutocomplete.xhtml
index 269e55bd6..269e55bd6 100644
--- a/toolkit/components/formautofill/content/requestAutocomplete.xhtml
+++ b/components/formautofill/content/requestAutocomplete.xhtml
diff --git a/toolkit/components/formautofill/formautofill.manifest b/components/formautofill/formautofill.manifest
index 880972edc..880972edc 100644
--- a/toolkit/components/formautofill/formautofill.manifest
+++ b/components/formautofill/formautofill.manifest
diff --git a/toolkit/components/formautofill/jar.mn b/components/formautofill/jar.mn
index ebe869b58..ebe869b58 100644
--- a/toolkit/components/formautofill/jar.mn
+++ b/components/formautofill/jar.mn
diff --git a/toolkit/components/formautofill/locale/requestAutocomplete.dtd b/components/formautofill/locale/requestAutocomplete.dtd
index 53a1d0d23..53a1d0d23 100644
--- a/toolkit/components/formautofill/locale/requestAutocomplete.dtd
+++ b/components/formautofill/locale/requestAutocomplete.dtd
diff --git a/toolkit/components/formautofill/moz.build b/components/formautofill/moz.build
index ef83ef163..ef83ef163 100644
--- a/toolkit/components/formautofill/moz.build
+++ b/components/formautofill/moz.build
diff --git a/toolkit/components/formautofill/public/nsIFormAutofillContentService.idl b/components/formautofill/public/nsIFormAutofillContentService.idl
index 300645e74..300645e74 100644
--- a/toolkit/components/formautofill/public/nsIFormAutofillContentService.idl
+++ b/components/formautofill/public/nsIFormAutofillContentService.idl
diff --git a/toolkit/components/formautofill/src/FormAutofill.jsm b/components/formautofill/src/FormAutofill.jsm
index aae3a956c..aae3a956c 100644
--- a/toolkit/components/formautofill/src/FormAutofill.jsm
+++ b/components/formautofill/src/FormAutofill.jsm
diff --git a/toolkit/components/formautofill/src/FormAutofillContentService.js b/components/formautofill/src/FormAutofillContentService.js
index ee8e978ad..ee8e978ad 100644
--- a/toolkit/components/formautofill/src/FormAutofillContentService.js
+++ b/components/formautofill/src/FormAutofillContentService.js
diff --git a/toolkit/components/formautofill/src/FormAutofillIntegration.jsm b/components/formautofill/src/FormAutofillIntegration.jsm
index 4b838a6ab..4b838a6ab 100644
--- a/toolkit/components/formautofill/src/FormAutofillIntegration.jsm
+++ b/components/formautofill/src/FormAutofillIntegration.jsm
diff --git a/toolkit/components/formautofill/src/FormAutofillStartup.js b/components/formautofill/src/FormAutofillStartup.js
index 92887f872..92887f872 100644
--- a/toolkit/components/formautofill/src/FormAutofillStartup.js
+++ b/components/formautofill/src/FormAutofillStartup.js
diff --git a/toolkit/components/formautofill/src/RequestAutocompleteUI.jsm b/components/formautofill/src/RequestAutocompleteUI.jsm
index 74c4834ba..74c4834ba 100644
--- a/toolkit/components/formautofill/src/RequestAutocompleteUI.jsm
+++ b/components/formautofill/src/RequestAutocompleteUI.jsm
diff --git a/toolkit/components/gfx/GfxSanityTest.manifest b/components/gfx/GfxSanityTest.manifest
index b9febc498..b9febc498 100644
--- a/toolkit/components/gfx/GfxSanityTest.manifest
+++ b/components/gfx/GfxSanityTest.manifest
diff --git a/toolkit/components/gfx/SanityTest.js b/components/gfx/SanityTest.js
index 03b9067ef..03b9067ef 100644
--- a/toolkit/components/gfx/SanityTest.js
+++ b/components/gfx/SanityTest.js
diff --git a/toolkit/components/gfx/content/gfxFrameScript.js b/components/gfx/content/gfxFrameScript.js
index d7f25d2ef..d7f25d2ef 100644
--- a/toolkit/components/gfx/content/gfxFrameScript.js
+++ b/components/gfx/content/gfxFrameScript.js
diff --git a/toolkit/components/gfx/content/sanityparent.html b/components/gfx/content/sanityparent.html
index 151214e68..151214e68 100644
--- a/toolkit/components/gfx/content/sanityparent.html
+++ b/components/gfx/content/sanityparent.html
diff --git a/toolkit/components/gfx/content/sanitytest.html b/components/gfx/content/sanitytest.html
index d60c47923..d60c47923 100644
--- a/toolkit/components/gfx/content/sanitytest.html
+++ b/components/gfx/content/sanitytest.html
diff --git a/toolkit/components/gfx/content/videotest.mp4 b/components/gfx/content/videotest.mp4
index 42cf6e1aa..42cf6e1aa 100644
--- a/toolkit/components/gfx/content/videotest.mp4
+++ b/components/gfx/content/videotest.mp4
diff --git a/toolkit/components/gfx/jar.mn b/components/gfx/jar.mn
index 4794e7d3d..4794e7d3d 100644
--- a/toolkit/components/gfx/jar.mn
+++ b/components/gfx/jar.mn
diff --git a/toolkit/components/gfx/moz.build b/components/gfx/moz.build
index 68b8580df..68b8580df 100644
--- a/toolkit/components/gfx/moz.build
+++ b/components/gfx/moz.build
diff --git a/toolkit/components/global/Makefile.in b/components/global/Makefile.in
index 3567e0b48..3567e0b48 100644
--- a/toolkit/components/global/Makefile.in
+++ b/components/global/Makefile.in
diff --git a/toolkit/components/global/content/TopLevelVideoDocument.js b/components/global/content/TopLevelVideoDocument.js
index 5a2b8a857..5a2b8a857 100644
--- a/toolkit/components/global/content/TopLevelVideoDocument.js
+++ b/components/global/content/TopLevelVideoDocument.js
diff --git a/toolkit/components/global/content/XPCNativeWrapper.js b/components/global/content/XPCNativeWrapper.js
index 7010a28ab..7010a28ab 100644
--- a/toolkit/components/global/content/XPCNativeWrapper.js
+++ b/components/global/content/XPCNativeWrapper.js
diff --git a/toolkit/components/global/content/about.js b/components/global/content/about.js
index c402ea685..c402ea685 100644
--- a/toolkit/components/global/content/about.js
+++ b/components/global/content/about.js
diff --git a/toolkit/components/global/content/about.xhtml b/components/global/content/about.xhtml
index 1f57ddcc3..1f57ddcc3 100644
--- a/toolkit/components/global/content/about.xhtml
+++ b/components/global/content/about.xhtml
diff --git a/toolkit/components/global/content/aboutAbout.js b/components/global/content/aboutAbout.js
index 13cb6bd6c..13cb6bd6c 100644
--- a/toolkit/components/global/content/aboutAbout.js
+++ b/components/global/content/aboutAbout.js
diff --git a/toolkit/components/global/content/aboutAbout.xhtml b/components/global/content/aboutAbout.xhtml
index 5ec038638..5ec038638 100644
--- a/toolkit/components/global/content/aboutAbout.xhtml
+++ b/components/global/content/aboutAbout.xhtml
diff --git a/toolkit/components/global/content/aboutNetworking.js b/components/global/content/aboutNetworking.js
index 9400ae9d7..9400ae9d7 100644
--- a/toolkit/components/global/content/aboutNetworking.js
+++ b/components/global/content/aboutNetworking.js
diff --git a/toolkit/components/global/content/aboutNetworking.xhtml b/components/global/content/aboutNetworking.xhtml
index 440ee7838..440ee7838 100644
--- a/toolkit/components/global/content/aboutNetworking.xhtml
+++ b/components/global/content/aboutNetworking.xhtml
diff --git a/toolkit/components/global/content/aboutProfiles.js b/components/global/content/aboutProfiles.js
index 0e548fd0f..0e548fd0f 100644
--- a/toolkit/components/global/content/aboutProfiles.js
+++ b/components/global/content/aboutProfiles.js
diff --git a/toolkit/components/global/content/aboutProfiles.xhtml b/components/global/content/aboutProfiles.xhtml
index ae2964932..ae2964932 100644
--- a/toolkit/components/global/content/aboutProfiles.xhtml
+++ b/components/global/content/aboutProfiles.xhtml
diff --git a/toolkit/components/global/content/aboutRights-unbranded.xhtml b/components/global/content/aboutRights-unbranded.xhtml
index dfa12532d..dfa12532d 100644
--- a/toolkit/components/global/content/aboutRights-unbranded.xhtml
+++ b/components/global/content/aboutRights-unbranded.xhtml
diff --git a/toolkit/components/global/content/aboutRights.xhtml b/components/global/content/aboutRights.xhtml
index e7f50f2e6..e7f50f2e6 100644
--- a/toolkit/components/global/content/aboutRights.xhtml
+++ b/components/global/content/aboutRights.xhtml
diff --git a/toolkit/components/global/content/aboutServiceWorkers.js b/components/global/content/aboutServiceWorkers.js
index 1f0b67c17..1f0b67c17 100644
--- a/toolkit/components/global/content/aboutServiceWorkers.js
+++ b/components/global/content/aboutServiceWorkers.js
diff --git a/toolkit/components/global/content/aboutServiceWorkers.xhtml b/components/global/content/aboutServiceWorkers.xhtml
index 8b7c86ba1..8b7c86ba1 100644
--- a/toolkit/components/global/content/aboutServiceWorkers.xhtml
+++ b/components/global/content/aboutServiceWorkers.xhtml
diff --git a/toolkit/components/global/content/aboutSupport.js b/components/global/content/aboutSupport.js
index 86f1fa35b..86f1fa35b 100644
--- a/toolkit/components/global/content/aboutSupport.js
+++ b/components/global/content/aboutSupport.js
diff --git a/toolkit/components/global/content/aboutSupport.xhtml b/components/global/content/aboutSupport.xhtml
index 7772f6497..7772f6497 100644
--- a/toolkit/components/global/content/aboutSupport.xhtml
+++ b/components/global/content/aboutSupport.xhtml
diff --git a/toolkit/components/global/content/aboutwebrtc/aboutWebrtc.css b/components/global/content/aboutwebrtc/aboutWebrtc.css
index b9021dde6..b9021dde6 100644
--- a/toolkit/components/global/content/aboutwebrtc/aboutWebrtc.css
+++ b/components/global/content/aboutwebrtc/aboutWebrtc.css
diff --git a/toolkit/components/global/content/aboutwebrtc/aboutWebrtc.html b/components/global/content/aboutwebrtc/aboutWebrtc.html
index 42cda348e..42cda348e 100644
--- a/toolkit/components/global/content/aboutwebrtc/aboutWebrtc.html
+++ b/components/global/content/aboutwebrtc/aboutWebrtc.html
diff --git a/toolkit/components/global/content/aboutwebrtc/aboutWebrtc.js b/components/global/content/aboutwebrtc/aboutWebrtc.js
index f494c7b4d..f494c7b4d 100644
--- a/toolkit/components/global/content/aboutwebrtc/aboutWebrtc.js
+++ b/components/global/content/aboutwebrtc/aboutWebrtc.js
diff --git a/toolkit/components/global/content/autocomplete.css b/components/global/content/autocomplete.css
index 11b36ddac..11b36ddac 100644
--- a/toolkit/components/global/content/autocomplete.css
+++ b/components/global/content/autocomplete.css
diff --git a/toolkit/components/global/content/browser-child.js b/components/global/content/browser-child.js
index ffb07dde2..ffb07dde2 100644
--- a/toolkit/components/global/content/browser-child.js
+++ b/components/global/content/browser-child.js
diff --git a/toolkit/components/global/content/browser-content.js b/components/global/content/browser-content.js
index d6185c5dd..d6185c5dd 100644
--- a/toolkit/components/global/content/browser-content.js
+++ b/components/global/content/browser-content.js
diff --git a/toolkit/components/global/content/buildconfig.html b/components/global/content/buildconfig.html
index 322208189..322208189 100644
--- a/toolkit/components/global/content/buildconfig.html
+++ b/components/global/content/buildconfig.html
diff --git a/toolkit/components/global/content/contentAreaUtils.js b/components/global/content/contentAreaUtils.js
index 17e463325..17e463325 100644
--- a/toolkit/components/global/content/contentAreaUtils.js
+++ b/components/global/content/contentAreaUtils.js
diff --git a/toolkit/components/global/content/customizeToolbar.css b/components/global/content/customizeToolbar.css
index ae90a2f28..ae90a2f28 100644
--- a/toolkit/components/global/content/customizeToolbar.css
+++ b/components/global/content/customizeToolbar.css
diff --git a/toolkit/components/global/content/customizeToolbar.js b/components/global/content/customizeToolbar.js
index 1775d9f52..1775d9f52 100644
--- a/toolkit/components/global/content/customizeToolbar.js
+++ b/components/global/content/customizeToolbar.js
diff --git a/toolkit/components/global/content/customizeToolbar.xul b/components/global/content/customizeToolbar.xul
index 09c45e834..09c45e834 100644
--- a/toolkit/components/global/content/customizeToolbar.xul
+++ b/components/global/content/customizeToolbar.xul
diff --git a/toolkit/components/global/content/datepicker.xhtml b/components/global/content/datepicker.xhtml
index 4da6e398f..4da6e398f 100644
--- a/toolkit/components/global/content/datepicker.xhtml
+++ b/components/global/content/datepicker.xhtml
diff --git a/toolkit/components/global/content/dialogOverlay.js b/components/global/content/dialogOverlay.js
index 4b03f268f..4b03f268f 100644
--- a/toolkit/components/global/content/dialogOverlay.js
+++ b/components/global/content/dialogOverlay.js
diff --git a/toolkit/components/global/content/dialogOverlay.xul b/components/global/content/dialogOverlay.xul
index 9d4d8b613..9d4d8b613 100644
--- a/toolkit/components/global/content/dialogOverlay.xul
+++ b/components/global/content/dialogOverlay.xul
diff --git a/toolkit/components/global/content/directionDetector.html b/components/global/content/directionDetector.html
index 5e91ba7f5..5e91ba7f5 100644
--- a/toolkit/components/global/content/directionDetector.html
+++ b/components/global/content/directionDetector.html
diff --git a/toolkit/components/global/content/editMenuOverlay.js b/components/global/content/editMenuOverlay.js
index a610b641a..a610b641a 100644
--- a/toolkit/components/global/content/editMenuOverlay.js
+++ b/components/global/content/editMenuOverlay.js
diff --git a/toolkit/components/global/content/editMenuOverlay.xul b/components/global/content/editMenuOverlay.xul
index 909701990..909701990 100644
--- a/toolkit/components/global/content/editMenuOverlay.xul
+++ b/components/global/content/editMenuOverlay.xul
diff --git a/toolkit/components/global/content/filepicker.properties b/components/global/content/filepicker.properties
index 5be84e3a0..5be84e3a0 100644
--- a/toolkit/components/global/content/filepicker.properties
+++ b/components/global/content/filepicker.properties
diff --git a/toolkit/components/global/content/findUtils.js b/components/global/content/findUtils.js
index 397a98f6c..397a98f6c 100644
--- a/toolkit/components/global/content/findUtils.js
+++ b/components/global/content/findUtils.js
diff --git a/toolkit/components/global/content/finddialog.js b/components/global/content/finddialog.js
index fc5875321..fc5875321 100644
--- a/toolkit/components/global/content/finddialog.js
+++ b/components/global/content/finddialog.js
diff --git a/toolkit/components/global/content/finddialog.xul b/components/global/content/finddialog.xul
index c49092e6f..c49092e6f 100644
--- a/toolkit/components/global/content/finddialog.xul
+++ b/components/global/content/finddialog.xul
diff --git a/toolkit/components/global/content/globalOverlay.js b/components/global/content/globalOverlay.js
index d5ee13191..d5ee13191 100644
--- a/toolkit/components/global/content/globalOverlay.js
+++ b/components/global/content/globalOverlay.js
diff --git a/toolkit/components/global/content/globalOverlay.xul b/components/global/content/globalOverlay.xul
index 90268a8e4..90268a8e4 100644
--- a/toolkit/components/global/content/globalOverlay.xul
+++ b/components/global/content/globalOverlay.xul
diff --git a/toolkit/components/global/content/gmp-sources/openh264.json b/components/global/content/gmp-sources/openh264.json
index 7c6eb0197..7c6eb0197 100644
--- a/toolkit/components/global/content/gmp-sources/openh264.json
+++ b/components/global/content/gmp-sources/openh264.json
diff --git a/toolkit/components/global/content/gmp-sources/widevinecdm.json b/components/global/content/gmp-sources/widevinecdm.json
index 02ef7fee5..02ef7fee5 100644
--- a/toolkit/components/global/content/gmp-sources/widevinecdm.json
+++ b/components/global/content/gmp-sources/widevinecdm.json
diff --git a/toolkit/components/global/content/inlineSpellCheckUI.js b/components/global/content/inlineSpellCheckUI.js
index 177ce90cd..177ce90cd 100644
--- a/toolkit/components/global/content/inlineSpellCheckUI.js
+++ b/components/global/content/inlineSpellCheckUI.js
diff --git a/toolkit/components/global/content/logopage.xhtml b/components/global/content/logopage.xhtml
index 80de8ed58..80de8ed58 100644
--- a/toolkit/components/global/content/logopage.xhtml
+++ b/components/global/content/logopage.xhtml
diff --git a/toolkit/components/global/content/menulist.css b/components/global/content/menulist.css
index ae6166d1b..ae6166d1b 100644
--- a/toolkit/components/global/content/menulist.css
+++ b/components/global/content/menulist.css
diff --git a/toolkit/components/global/content/minimal-xul.css b/components/global/content/minimal-xul.css
index 0cd41922d..0cd41922d 100644
--- a/toolkit/components/global/content/minimal-xul.css
+++ b/components/global/content/minimal-xul.css
diff --git a/toolkit/components/global/content/mozilla.xhtml b/components/global/content/mozilla.xhtml
index f1a1b474d..f1a1b474d 100644
--- a/toolkit/components/global/content/mozilla.xhtml
+++ b/components/global/content/mozilla.xhtml
diff --git a/toolkit/components/global/content/nsClipboard.js b/components/global/content/nsClipboard.js
index d9f7c4589..d9f7c4589 100644
--- a/toolkit/components/global/content/nsClipboard.js
+++ b/components/global/content/nsClipboard.js
diff --git a/toolkit/components/global/content/nsUserSettings.js b/components/global/content/nsUserSettings.js
index e0c378caf..e0c378caf 100644
--- a/toolkit/components/global/content/nsUserSettings.js
+++ b/components/global/content/nsUserSettings.js
diff --git a/toolkit/components/global/content/plugins.css b/components/global/content/plugins.css
index a599b5be4..a599b5be4 100644
--- a/toolkit/components/global/content/plugins.css
+++ b/components/global/content/plugins.css
diff --git a/toolkit/components/global/content/plugins.html b/components/global/content/plugins.html
index 15bbed9bb..15bbed9bb 100644
--- a/toolkit/components/global/content/plugins.html
+++ b/components/global/content/plugins.html
diff --git a/toolkit/components/global/content/process-content.js b/components/global/content/process-content.js
index 2ff8f908a..2ff8f908a 100644
--- a/toolkit/components/global/content/process-content.js
+++ b/components/global/content/process-content.js
diff --git a/toolkit/components/global/content/resetProfile.css b/components/global/content/resetProfile.css
index a83171ff5..a83171ff5 100644
--- a/toolkit/components/global/content/resetProfile.css
+++ b/components/global/content/resetProfile.css
diff --git a/toolkit/components/global/content/resetProfile.js b/components/global/content/resetProfile.js
index 9a46a09a5..9a46a09a5 100644
--- a/toolkit/components/global/content/resetProfile.js
+++ b/components/global/content/resetProfile.js
diff --git a/toolkit/components/global/content/resetProfile.xul b/components/global/content/resetProfile.xul
index 845d473a4..845d473a4 100644
--- a/toolkit/components/global/content/resetProfile.xul
+++ b/components/global/content/resetProfile.xul
diff --git a/toolkit/components/global/content/resetProfileProgress.xul b/components/global/content/resetProfileProgress.xul
index 66585e224..66585e224 100644
--- a/toolkit/components/global/content/resetProfileProgress.xul
+++ b/components/global/content/resetProfileProgress.xul
diff --git a/toolkit/components/global/content/select-child.js b/components/global/content/select-child.js
index d3690b7b8..d3690b7b8 100644
--- a/toolkit/components/global/content/select-child.js
+++ b/components/global/content/select-child.js
diff --git a/toolkit/components/global/content/strres.js b/components/global/content/strres.js
index 928c8f75f..928c8f75f 100644
--- a/toolkit/components/global/content/strres.js
+++ b/components/global/content/strres.js
diff --git a/toolkit/components/global/content/tests/reftests/reftest-stylo.list b/components/global/content/tests/reftests/reftest-stylo.list
index 77caaabfc..77caaabfc 100644
--- a/toolkit/components/global/content/tests/reftests/reftest-stylo.list
+++ b/components/global/content/tests/reftests/reftest-stylo.list
diff --git a/toolkit/components/global/content/tests/reftests/reftest.list b/components/global/content/tests/reftests/reftest.list
index a37a9722a..a37a9722a 100644
--- a/toolkit/components/global/content/tests/reftests/reftest.list
+++ b/components/global/content/tests/reftests/reftest.list
diff --git a/toolkit/components/global/content/textbox.css b/components/global/content/textbox.css
index a16b4fd43..a16b4fd43 100644
--- a/toolkit/components/global/content/textbox.css
+++ b/components/global/content/textbox.css
diff --git a/toolkit/components/global/content/timepicker.xhtml b/components/global/content/timepicker.xhtml
index 77b9fba41..77b9fba41 100644
--- a/toolkit/components/global/content/timepicker.xhtml
+++ b/components/global/content/timepicker.xhtml
diff --git a/toolkit/components/global/content/treeUtils.js b/components/global/content/treeUtils.js
index b4d1fb17d..b4d1fb17d 100644
--- a/toolkit/components/global/content/treeUtils.js
+++ b/components/global/content/treeUtils.js
diff --git a/toolkit/components/global/content/viewZoomOverlay.js b/components/global/content/viewZoomOverlay.js
index 66e054437..66e054437 100644
--- a/toolkit/components/global/content/viewZoomOverlay.js
+++ b/components/global/content/viewZoomOverlay.js
diff --git a/toolkit/components/global/content/xul.css b/components/global/content/xul.css
index f51ec77e4..f51ec77e4 100644
--- a/toolkit/components/global/content/xul.css
+++ b/components/global/content/xul.css
diff --git a/toolkit/components/global/jar.mn b/components/global/jar.mn
index 641b07ea8..641b07ea8 100644
--- a/toolkit/components/global/jar.mn
+++ b/components/global/jar.mn
diff --git a/toolkit/components/global/locale/about.dtd b/components/global/locale/about.dtd
index 5de3837ad..5de3837ad 100644
--- a/toolkit/components/global/locale/about.dtd
+++ b/components/global/locale/about.dtd
diff --git a/toolkit/components/global/locale/aboutAbout.dtd b/components/global/locale/aboutAbout.dtd
index 7d858fe31..7d858fe31 100644
--- a/toolkit/components/global/locale/aboutAbout.dtd
+++ b/components/global/locale/aboutAbout.dtd
diff --git a/toolkit/components/global/locale/aboutNetworking.dtd b/components/global/locale/aboutNetworking.dtd
index 4069e21c0..4069e21c0 100644
--- a/toolkit/components/global/locale/aboutNetworking.dtd
+++ b/components/global/locale/aboutNetworking.dtd
diff --git a/toolkit/components/global/locale/aboutProfiles.dtd b/components/global/locale/aboutProfiles.dtd
index 5091517b2..5091517b2 100644
--- a/toolkit/components/global/locale/aboutProfiles.dtd
+++ b/components/global/locale/aboutProfiles.dtd
diff --git a/toolkit/components/global/locale/aboutProfiles.properties b/components/global/locale/aboutProfiles.properties
index afe141766..afe141766 100644
--- a/toolkit/components/global/locale/aboutProfiles.properties
+++ b/components/global/locale/aboutProfiles.properties
diff --git a/toolkit/components/global/locale/aboutReader.properties b/components/global/locale/aboutReader.properties
index 10d145686..10d145686 100644
--- a/toolkit/components/global/locale/aboutReader.properties
+++ b/components/global/locale/aboutReader.properties
diff --git a/toolkit/components/global/locale/aboutRights.dtd b/components/global/locale/aboutRights.dtd
index eea75bd49..eea75bd49 100644
--- a/toolkit/components/global/locale/aboutRights.dtd
+++ b/components/global/locale/aboutRights.dtd
diff --git a/toolkit/components/global/locale/aboutServiceWorkers.dtd b/components/global/locale/aboutServiceWorkers.dtd
index d7d0298dd..d7d0298dd 100644
--- a/toolkit/components/global/locale/aboutServiceWorkers.dtd
+++ b/components/global/locale/aboutServiceWorkers.dtd
diff --git a/toolkit/components/global/locale/aboutServiceWorkers.properties b/components/global/locale/aboutServiceWorkers.properties
index 34609f75b..34609f75b 100644
--- a/toolkit/components/global/locale/aboutServiceWorkers.properties
+++ b/components/global/locale/aboutServiceWorkers.properties
diff --git a/toolkit/components/global/locale/aboutSupport.dtd b/components/global/locale/aboutSupport.dtd
index b4da6bc77..b4da6bc77 100644
--- a/toolkit/components/global/locale/aboutSupport.dtd
+++ b/components/global/locale/aboutSupport.dtd
diff --git a/toolkit/components/global/locale/aboutSupport.properties b/components/global/locale/aboutSupport.properties
index 751a3f096..751a3f096 100644
--- a/toolkit/components/global/locale/aboutSupport.properties
+++ b/components/global/locale/aboutSupport.properties
diff --git a/toolkit/components/global/locale/aboutTelemetry.dtd b/components/global/locale/aboutTelemetry.dtd
index 4a08de8ca..4a08de8ca 100644
--- a/toolkit/components/global/locale/aboutTelemetry.dtd
+++ b/components/global/locale/aboutTelemetry.dtd
diff --git a/toolkit/components/global/locale/aboutTelemetry.properties b/components/global/locale/aboutTelemetry.properties
index c649c8082..c649c8082 100644
--- a/toolkit/components/global/locale/aboutTelemetry.properties
+++ b/components/global/locale/aboutTelemetry.properties
diff --git a/toolkit/components/global/locale/aboutWebrtc.properties b/components/global/locale/aboutWebrtc.properties
index e1b270f7c..e1b270f7c 100644
--- a/toolkit/components/global/locale/aboutWebrtc.properties
+++ b/components/global/locale/aboutWebrtc.properties
diff --git a/toolkit/components/global/locale/appPicker.dtd b/components/global/locale/appPicker.dtd
index 04d9bb8fe..04d9bb8fe 100644
--- a/toolkit/components/global/locale/appPicker.dtd
+++ b/components/global/locale/appPicker.dtd
diff --git a/toolkit/components/global/locale/autocomplete.properties b/components/global/locale/autocomplete.properties
index 44da643ac..44da643ac 100644
--- a/toolkit/components/global/locale/autocomplete.properties
+++ b/components/global/locale/autocomplete.properties
diff --git a/toolkit/components/global/locale/autoconfig.properties b/components/global/locale/autoconfig.properties
index 7c5e15ea1..7c5e15ea1 100644
--- a/toolkit/components/global/locale/autoconfig.properties
+++ b/components/global/locale/autoconfig.properties
diff --git a/toolkit/components/global/locale/browser.properties b/components/global/locale/browser.properties
index 2b3150629..2b3150629 100644
--- a/toolkit/components/global/locale/browser.properties
+++ b/components/global/locale/browser.properties
diff --git a/toolkit/components/global/locale/charsetMenu.dtd b/components/global/locale/charsetMenu.dtd
index 140627251..140627251 100644
--- a/toolkit/components/global/locale/charsetMenu.dtd
+++ b/components/global/locale/charsetMenu.dtd
diff --git a/toolkit/components/global/locale/charsetMenu.properties b/components/global/locale/charsetMenu.properties
index a86a58320..a86a58320 100644
--- a/toolkit/components/global/locale/charsetMenu.properties
+++ b/components/global/locale/charsetMenu.properties
diff --git a/toolkit/components/global/locale/commonDialog.dtd b/components/global/locale/commonDialog.dtd
index a2273a61b..a2273a61b 100644
--- a/toolkit/components/global/locale/commonDialog.dtd
+++ b/components/global/locale/commonDialog.dtd
diff --git a/toolkit/components/global/locale/commonDialogs.properties b/components/global/locale/commonDialogs.properties
index 001705b18..001705b18 100644
--- a/toolkit/components/global/locale/commonDialogs.properties
+++ b/components/global/locale/commonDialogs.properties
diff --git a/toolkit/components/global/locale/config.dtd b/components/global/locale/config.dtd
index a9bf8ab48..a9bf8ab48 100644
--- a/toolkit/components/global/locale/config.dtd
+++ b/components/global/locale/config.dtd
diff --git a/toolkit/components/global/locale/config.properties b/components/global/locale/config.properties
index 31b832cfa..31b832cfa 100644
--- a/toolkit/components/global/locale/config.properties
+++ b/components/global/locale/config.properties
diff --git a/toolkit/components/global/locale/console.dtd b/components/global/locale/console.dtd
index b5611fad4..b5611fad4 100644
--- a/toolkit/components/global/locale/console.dtd
+++ b/components/global/locale/console.dtd
diff --git a/toolkit/components/global/locale/console.properties b/components/global/locale/console.properties
index a17a250b3..a17a250b3 100644
--- a/toolkit/components/global/locale/console.properties
+++ b/components/global/locale/console.properties
diff --git a/toolkit/components/global/locale/contentAreaCommands.properties b/components/global/locale/contentAreaCommands.properties
index 1941c5e6b..1941c5e6b 100644
--- a/toolkit/components/global/locale/contentAreaCommands.properties
+++ b/components/global/locale/contentAreaCommands.properties
diff --git a/toolkit/components/global/locale/customizeToolbar.dtd b/components/global/locale/customizeToolbar.dtd
index 01448273d..01448273d 100644
--- a/toolkit/components/global/locale/customizeToolbar.dtd
+++ b/components/global/locale/customizeToolbar.dtd
diff --git a/toolkit/components/global/locale/customizeToolbar.properties b/components/global/locale/customizeToolbar.properties
index b19152fab..b19152fab 100644
--- a/toolkit/components/global/locale/customizeToolbar.properties
+++ b/components/global/locale/customizeToolbar.properties
diff --git a/toolkit/components/global/locale/dateFormat.properties b/components/global/locale/dateFormat.properties
index a564c0d4d..a564c0d4d 100644
--- a/toolkit/components/global/locale/dateFormat.properties
+++ b/components/global/locale/dateFormat.properties
diff --git a/toolkit/components/global/locale/datetimebox.dtd b/components/global/locale/datetimebox.dtd
index 0deffa6b3..0deffa6b3 100644
--- a/toolkit/components/global/locale/datetimebox.dtd
+++ b/components/global/locale/datetimebox.dtd
diff --git a/toolkit/components/global/locale/datetimepicker.dtd b/components/global/locale/datetimepicker.dtd
index b010c4831..b010c4831 100644
--- a/toolkit/components/global/locale/datetimepicker.dtd
+++ b/components/global/locale/datetimepicker.dtd
diff --git a/toolkit/components/global/locale/dialog.properties b/components/global/locale/dialog.properties
index ce6acb5ef..ce6acb5ef 100644
--- a/toolkit/components/global/locale/dialog.properties
+++ b/components/global/locale/dialog.properties
diff --git a/toolkit/components/global/locale/dialogOverlay.dtd b/components/global/locale/dialogOverlay.dtd
index 217b8c9e9..217b8c9e9 100644
--- a/toolkit/components/global/locale/dialogOverlay.dtd
+++ b/components/global/locale/dialogOverlay.dtd
diff --git a/toolkit/components/global/locale/editMenuOverlay.dtd b/components/global/locale/editMenuOverlay.dtd
index 44185616b..44185616b 100644
--- a/toolkit/components/global/locale/editMenuOverlay.dtd
+++ b/components/global/locale/editMenuOverlay.dtd
diff --git a/toolkit/components/global/locale/extensions.properties b/components/global/locale/extensions.properties
index 20ee688ba..20ee688ba 100644
--- a/toolkit/components/global/locale/extensions.properties
+++ b/components/global/locale/extensions.properties
diff --git a/toolkit/components/global/locale/fallbackMenubar.properties b/components/global/locale/fallbackMenubar.properties
index 9765689ec..9765689ec 100644
--- a/toolkit/components/global/locale/fallbackMenubar.properties
+++ b/components/global/locale/fallbackMenubar.properties
diff --git a/toolkit/components/global/locale/filefield.properties b/components/global/locale/filefield.properties
index affe3e89f..affe3e89f 100644
--- a/toolkit/components/global/locale/filefield.properties
+++ b/components/global/locale/filefield.properties
diff --git a/toolkit/components/global/locale/filepicker.dtd b/components/global/locale/filepicker.dtd
index 3367722ee..3367722ee 100644
--- a/toolkit/components/global/locale/filepicker.dtd
+++ b/components/global/locale/filepicker.dtd
diff --git a/toolkit/components/global/locale/filepicker.properties b/components/global/locale/filepicker.properties
index 9c9be1f78..9c9be1f78 100644
--- a/toolkit/components/global/locale/filepicker.properties
+++ b/components/global/locale/filepicker.properties
diff --git a/toolkit/components/global/locale/findbar.dtd b/components/global/locale/findbar.dtd
index a90c77c7e..a90c77c7e 100644
--- a/toolkit/components/global/locale/findbar.dtd
+++ b/components/global/locale/findbar.dtd
diff --git a/toolkit/components/global/locale/findbar.properties b/components/global/locale/findbar.properties
index abe037ba7..abe037ba7 100644
--- a/toolkit/components/global/locale/findbar.properties
+++ b/components/global/locale/findbar.properties
diff --git a/toolkit/components/global/locale/finddialog.dtd b/components/global/locale/finddialog.dtd
index d3ca7e5dc..d3ca7e5dc 100644
--- a/toolkit/components/global/locale/finddialog.dtd
+++ b/components/global/locale/finddialog.dtd
diff --git a/toolkit/components/global/locale/finddialog.properties b/components/global/locale/finddialog.properties
index 67b0b3c41..67b0b3c41 100644
--- a/toolkit/components/global/locale/finddialog.properties
+++ b/components/global/locale/finddialog.properties
diff --git a/toolkit/components/global/locale/globalKeys.dtd b/components/global/locale/globalKeys.dtd
index 76b923571..76b923571 100644
--- a/toolkit/components/global/locale/globalKeys.dtd
+++ b/components/global/locale/globalKeys.dtd
diff --git a/toolkit/components/global/locale/headsUpDisplay.properties b/components/global/locale/headsUpDisplay.properties
index 6a95bb036..6a95bb036 100644
--- a/toolkit/components/global/locale/headsUpDisplay.properties
+++ b/components/global/locale/headsUpDisplay.properties
diff --git a/toolkit/components/global/locale/intl.css b/components/global/locale/intl.css
index 2f54eb367..2f54eb367 100644
--- a/toolkit/components/global/locale/intl.css
+++ b/components/global/locale/intl.css
diff --git a/toolkit/components/global/locale/intl.properties b/components/global/locale/intl.properties
index 0fd8a493f..0fd8a493f 100644
--- a/toolkit/components/global/locale/intl.properties
+++ b/components/global/locale/intl.properties
diff --git a/toolkit/components/global/locale/keys.properties b/components/global/locale/keys.properties
index 1137bf7c6..1137bf7c6 100644
--- a/toolkit/components/global/locale/keys.properties
+++ b/components/global/locale/keys.properties
diff --git a/toolkit/components/global/locale/languageNames.properties b/components/global/locale/languageNames.properties
index 234000d11..234000d11 100644
--- a/toolkit/components/global/locale/languageNames.properties
+++ b/components/global/locale/languageNames.properties
diff --git a/toolkit/components/global/locale/narrate.properties b/components/global/locale/narrate.properties
index 9ac839427..9ac839427 100644
--- a/toolkit/components/global/locale/narrate.properties
+++ b/components/global/locale/narrate.properties
diff --git a/toolkit/components/global/locale/notification.dtd b/components/global/locale/notification.dtd
index 75aea0b98..75aea0b98 100644
--- a/toolkit/components/global/locale/notification.dtd
+++ b/components/global/locale/notification.dtd
diff --git a/toolkit/components/global/locale/nsTreeSorting.properties b/components/global/locale/nsTreeSorting.properties
index 49629a838..49629a838 100644
--- a/toolkit/components/global/locale/nsTreeSorting.properties
+++ b/components/global/locale/nsTreeSorting.properties
diff --git a/toolkit/components/global/locale/preferences.dtd b/components/global/locale/preferences.dtd
index 4824e5c06..4824e5c06 100644
--- a/toolkit/components/global/locale/preferences.dtd
+++ b/components/global/locale/preferences.dtd
diff --git a/toolkit/components/global/locale/printPageSetup.dtd b/components/global/locale/printPageSetup.dtd
index 601d9a602..601d9a602 100644
--- a/toolkit/components/global/locale/printPageSetup.dtd
+++ b/components/global/locale/printPageSetup.dtd
diff --git a/toolkit/components/global/locale/printPreview.dtd b/components/global/locale/printPreview.dtd
index 8e68fde25..8e68fde25 100644
--- a/toolkit/components/global/locale/printPreview.dtd
+++ b/components/global/locale/printPreview.dtd
diff --git a/toolkit/components/global/locale/printPreviewProgress.dtd b/components/global/locale/printPreviewProgress.dtd
index 344674c16..344674c16 100644
--- a/toolkit/components/global/locale/printPreviewProgress.dtd
+++ b/components/global/locale/printPreviewProgress.dtd
diff --git a/toolkit/components/global/locale/printProgress.dtd b/components/global/locale/printProgress.dtd
index 30bfe0292..30bfe0292 100644
--- a/toolkit/components/global/locale/printProgress.dtd
+++ b/components/global/locale/printProgress.dtd
diff --git a/toolkit/components/global/locale/printdialog.dtd b/components/global/locale/printdialog.dtd
index 847999795..847999795 100644
--- a/toolkit/components/global/locale/printdialog.dtd
+++ b/components/global/locale/printdialog.dtd
diff --git a/toolkit/components/global/locale/printdialog.properties b/components/global/locale/printdialog.properties
index ae583eda5..ae583eda5 100644
--- a/toolkit/components/global/locale/printdialog.properties
+++ b/components/global/locale/printdialog.properties
diff --git a/toolkit/components/global/locale/printjoboptions.dtd b/components/global/locale/printjoboptions.dtd
index 08b579416..08b579416 100644
--- a/toolkit/components/global/locale/printjoboptions.dtd
+++ b/components/global/locale/printjoboptions.dtd
diff --git a/toolkit/components/global/locale/regionNames.properties b/components/global/locale/regionNames.properties
index 29287a65f..29287a65f 100644
--- a/toolkit/components/global/locale/regionNames.properties
+++ b/components/global/locale/regionNames.properties
diff --git a/toolkit/components/global/locale/resetProfile.dtd b/components/global/locale/resetProfile.dtd
index 831b901c5..831b901c5 100644
--- a/toolkit/components/global/locale/resetProfile.dtd
+++ b/components/global/locale/resetProfile.dtd
diff --git a/toolkit/components/global/locale/resetProfile.properties b/components/global/locale/resetProfile.properties
index c06007299..c06007299 100644
--- a/toolkit/components/global/locale/resetProfile.properties
+++ b/components/global/locale/resetProfile.properties
diff --git a/toolkit/components/global/locale/textcontext.dtd b/components/global/locale/textcontext.dtd
index 4ab18cbd8..4ab18cbd8 100644
--- a/toolkit/components/global/locale/textcontext.dtd
+++ b/components/global/locale/textcontext.dtd
diff --git a/toolkit/components/global/locale/tree.dtd b/components/global/locale/tree.dtd
index 7922852f5..7922852f5 100644
--- a/toolkit/components/global/locale/tree.dtd
+++ b/components/global/locale/tree.dtd
diff --git a/toolkit/components/global/locale/unix/intl.properties b/components/global/locale/unix/intl.properties
index 71265a9ef..71265a9ef 100644
--- a/toolkit/components/global/locale/unix/intl.properties
+++ b/components/global/locale/unix/intl.properties
diff --git a/toolkit/components/global/locale/unix/platformKeys.properties b/components/global/locale/unix/platformKeys.properties
index 53321356e..53321356e 100644
--- a/toolkit/components/global/locale/unix/platformKeys.properties
+++ b/components/global/locale/unix/platformKeys.properties
diff --git a/toolkit/components/global/locale/videocontrols.dtd b/components/global/locale/videocontrols.dtd
index 7f3b6eecb..7f3b6eecb 100644
--- a/toolkit/components/global/locale/videocontrols.dtd
+++ b/components/global/locale/videocontrols.dtd
diff --git a/toolkit/components/global/locale/viewSource.dtd b/components/global/locale/viewSource.dtd
index 1a294b877..1a294b877 100644
--- a/toolkit/components/global/locale/viewSource.dtd
+++ b/components/global/locale/viewSource.dtd
diff --git a/toolkit/components/global/locale/viewSource.properties b/components/global/locale/viewSource.properties
index 9137b383a..9137b383a 100644
--- a/toolkit/components/global/locale/viewSource.properties
+++ b/components/global/locale/viewSource.properties
diff --git a/toolkit/components/global/locale/win/intl.properties b/components/global/locale/win/intl.properties
index 71265a9ef..71265a9ef 100644
--- a/toolkit/components/global/locale/win/intl.properties
+++ b/components/global/locale/win/intl.properties
diff --git a/toolkit/components/global/locale/win/platformKeys.properties b/components/global/locale/win/platformKeys.properties
index 307eeaf19..307eeaf19 100644
--- a/toolkit/components/global/locale/win/platformKeys.properties
+++ b/components/global/locale/win/platformKeys.properties
diff --git a/toolkit/components/global/locale/wizard.dtd b/components/global/locale/wizard.dtd
index e8a7f90dc..e8a7f90dc 100644
--- a/toolkit/components/global/locale/wizard.dtd
+++ b/components/global/locale/wizard.dtd
diff --git a/toolkit/components/global/locale/wizard.properties b/components/global/locale/wizard.properties
index 99cc332e7..99cc332e7 100644
--- a/toolkit/components/global/locale/wizard.properties
+++ b/components/global/locale/wizard.properties
diff --git a/toolkit/components/global/moz.build b/components/global/moz.build
index f39d55a9e..f39d55a9e 100644
--- a/toolkit/components/global/moz.build
+++ b/components/global/moz.build
diff --git a/toolkit/components/gservice/moz.build b/components/gservice/moz.build
index 633ef2b4d..633ef2b4d 100644
--- a/toolkit/components/gservice/moz.build
+++ b/components/gservice/moz.build
diff --git a/toolkit/components/gservice/src/nsAlertsIconListener.cpp b/components/gservice/src/nsAlertsIconListener.cpp
index b11672d30..b11672d30 100644
--- a/toolkit/components/gservice/src/nsAlertsIconListener.cpp
+++ b/components/gservice/src/nsAlertsIconListener.cpp
diff --git a/toolkit/components/gservice/src/nsAlertsIconListener.h b/components/gservice/src/nsAlertsIconListener.h
index f3a745d33..f3a745d33 100644
--- a/toolkit/components/gservice/src/nsAlertsIconListener.h
+++ b/components/gservice/src/nsAlertsIconListener.h
diff --git a/toolkit/components/gservice/src/nsGConfService.cpp b/components/gservice/src/nsGConfService.cpp
index ede71e588..ede71e588 100644
--- a/toolkit/components/gservice/src/nsGConfService.cpp
+++ b/components/gservice/src/nsGConfService.cpp
diff --git a/toolkit/components/gservice/src/nsGConfService.h b/components/gservice/src/nsGConfService.h
index 4e500a40d..4e500a40d 100644
--- a/toolkit/components/gservice/src/nsGConfService.h
+++ b/components/gservice/src/nsGConfService.h
diff --git a/toolkit/components/gservice/src/nsGIOService.cpp b/components/gservice/src/nsGIOService.cpp
index 9196c7d76..9196c7d76 100644
--- a/toolkit/components/gservice/src/nsGIOService.cpp
+++ b/components/gservice/src/nsGIOService.cpp
diff --git a/toolkit/components/gservice/src/nsGIOService.h b/components/gservice/src/nsGIOService.h
index 2ae7a7e1a..2ae7a7e1a 100644
--- a/toolkit/components/gservice/src/nsGIOService.h
+++ b/components/gservice/src/nsGIOService.h
diff --git a/toolkit/components/gservice/src/nsGSettingsService.cpp b/components/gservice/src/nsGSettingsService.cpp
index d8c46b4fe..d8c46b4fe 100644
--- a/toolkit/components/gservice/src/nsGSettingsService.cpp
+++ b/components/gservice/src/nsGSettingsService.cpp
diff --git a/toolkit/components/gservice/src/nsGSettingsService.h b/components/gservice/src/nsGSettingsService.h
index 6ffcdedd1..6ffcdedd1 100644
--- a/toolkit/components/gservice/src/nsGSettingsService.h
+++ b/components/gservice/src/nsGSettingsService.h
diff --git a/toolkit/components/gservice/src/nsGnomeModule.cpp b/components/gservice/src/nsGnomeModule.cpp
index 6ecebcc1f..6ecebcc1f 100644
--- a/toolkit/components/gservice/src/nsGnomeModule.cpp
+++ b/components/gservice/src/nsGnomeModule.cpp
diff --git a/toolkit/components/gservice/src/nsPackageKitService.cpp b/components/gservice/src/nsPackageKitService.cpp
index c32a91367..c32a91367 100644
--- a/toolkit/components/gservice/src/nsPackageKitService.cpp
+++ b/components/gservice/src/nsPackageKitService.cpp
diff --git a/toolkit/components/gservice/src/nsPackageKitService.h b/components/gservice/src/nsPackageKitService.h
index b14c7c51f..b14c7c51f 100644
--- a/toolkit/components/gservice/src/nsPackageKitService.h
+++ b/components/gservice/src/nsPackageKitService.h
diff --git a/toolkit/components/gservice/src/nsSystemAlertsService.cpp b/components/gservice/src/nsSystemAlertsService.cpp
index 2af64383c..2af64383c 100644
--- a/toolkit/components/gservice/src/nsSystemAlertsService.cpp
+++ b/components/gservice/src/nsSystemAlertsService.cpp
diff --git a/toolkit/components/gservice/src/nsSystemAlertsService.h b/components/gservice/src/nsSystemAlertsService.h
index 66ae2ea27..66ae2ea27 100644
--- a/toolkit/components/gservice/src/nsSystemAlertsService.h
+++ b/components/gservice/src/nsSystemAlertsService.h
diff --git a/toolkit/components/handling/content/dialog.js b/components/handling/content/dialog.js
index 98a788201..98a788201 100644
--- a/toolkit/components/handling/content/dialog.js
+++ b/components/handling/content/dialog.js
diff --git a/toolkit/components/handling/content/dialog.xul b/components/handling/content/dialog.xul
index 2e2dab4e4..2e2dab4e4 100644
--- a/toolkit/components/handling/content/dialog.xul
+++ b/components/handling/content/dialog.xul
diff --git a/toolkit/components/handling/content/handler.css b/components/handling/content/handler.css
index 438ab296d..438ab296d 100644
--- a/toolkit/components/handling/content/handler.css
+++ b/components/handling/content/handler.css
diff --git a/toolkit/components/handling/content/handler.xml b/components/handling/content/handler.xml
index 3fd907b45..3fd907b45 100644
--- a/toolkit/components/handling/content/handler.xml
+++ b/components/handling/content/handler.xml
diff --git a/toolkit/components/handling/jar.mn b/components/handling/jar.mn
index 8c338a0db..8c338a0db 100644
--- a/toolkit/components/handling/jar.mn
+++ b/components/handling/jar.mn
diff --git a/toolkit/components/handling/locale/handling.dtd b/components/handling/locale/handling.dtd
index fe7a52566..fe7a52566 100644
--- a/toolkit/components/handling/locale/handling.dtd
+++ b/components/handling/locale/handling.dtd
diff --git a/toolkit/components/handling/locale/handling.properties b/components/handling/locale/handling.properties
index 46d347ad0..46d347ad0 100644
--- a/toolkit/components/handling/locale/handling.properties
+++ b/components/handling/locale/handling.properties
diff --git a/toolkit/components/handling/moz.build b/components/handling/moz.build
index 038ad2c09..038ad2c09 100644
--- a/toolkit/components/handling/moz.build
+++ b/components/handling/moz.build
diff --git a/toolkit/components/handling/nsContentDispatchChooser.manifest b/components/handling/nsContentDispatchChooser.manifest
index fcc76a410..fcc76a410 100644
--- a/toolkit/components/handling/nsContentDispatchChooser.manifest
+++ b/components/handling/nsContentDispatchChooser.manifest
diff --git a/toolkit/components/handling/src/nsContentDispatchChooser.js b/components/handling/src/nsContentDispatchChooser.js
index e02545594..e02545594 100644
--- a/toolkit/components/handling/src/nsContentDispatchChooser.js
+++ b/components/handling/src/nsContentDispatchChooser.js
diff --git a/toolkit/components/jetpack/app-extension/application.ini b/components/jetpack/app-extension/application.ini
index 6cec69a16..6cec69a16 100644
--- a/toolkit/components/jetpack/app-extension/application.ini
+++ b/components/jetpack/app-extension/application.ini
diff --git a/toolkit/components/jetpack/app-extension/bootstrap.js b/components/jetpack/app-extension/bootstrap.js
index c2207c75f..c2207c75f 100644
--- a/toolkit/components/jetpack/app-extension/bootstrap.js
+++ b/components/jetpack/app-extension/bootstrap.js
diff --git a/toolkit/components/jetpack/app-extension/install.rdf b/components/jetpack/app-extension/install.rdf
index 641d1cc21..641d1cc21 100644
--- a/toolkit/components/jetpack/app-extension/install.rdf
+++ b/components/jetpack/app-extension/install.rdf
diff --git a/toolkit/components/jetpack/dev/debuggee.js b/components/jetpack/dev/debuggee.js
index 0ca0bd37a..0ca0bd37a 100644
--- a/toolkit/components/jetpack/dev/debuggee.js
+++ b/components/jetpack/dev/debuggee.js
diff --git a/toolkit/components/jetpack/dev/frame-script.js b/components/jetpack/dev/frame-script.js
index 33a197419..33a197419 100644
--- a/toolkit/components/jetpack/dev/frame-script.js
+++ b/components/jetpack/dev/frame-script.js
diff --git a/toolkit/components/jetpack/dev/panel.js b/components/jetpack/dev/panel.js
index 1ef6a303a..1ef6a303a 100644
--- a/toolkit/components/jetpack/dev/panel.js
+++ b/components/jetpack/dev/panel.js
diff --git a/toolkit/components/jetpack/dev/panel/view.js b/components/jetpack/dev/panel/view.js
index 41cf9c221..41cf9c221 100644
--- a/toolkit/components/jetpack/dev/panel/view.js
+++ b/components/jetpack/dev/panel/view.js
diff --git a/toolkit/components/jetpack/dev/ports.js b/components/jetpack/dev/ports.js
index a41f59eb7..a41f59eb7 100644
--- a/toolkit/components/jetpack/dev/ports.js
+++ b/components/jetpack/dev/ports.js
diff --git a/toolkit/components/jetpack/dev/theme.js b/components/jetpack/dev/theme.js
index 05930a502..05930a502 100644
--- a/toolkit/components/jetpack/dev/theme.js
+++ b/components/jetpack/dev/theme.js
diff --git a/toolkit/components/jetpack/dev/theme/hooks.js b/components/jetpack/dev/theme/hooks.js
index 9987f853b..9987f853b 100644
--- a/toolkit/components/jetpack/dev/theme/hooks.js
+++ b/components/jetpack/dev/theme/hooks.js
diff --git a/toolkit/components/jetpack/dev/toolbox.js b/components/jetpack/dev/toolbox.js
index 43f37759f..43f37759f 100644
--- a/toolkit/components/jetpack/dev/toolbox.js
+++ b/components/jetpack/dev/toolbox.js
diff --git a/toolkit/components/jetpack/dev/utils.js b/components/jetpack/dev/utils.js
index 48db39e04..48db39e04 100644
--- a/toolkit/components/jetpack/dev/utils.js
+++ b/components/jetpack/dev/utils.js
diff --git a/toolkit/components/jetpack/dev/volcan.js b/components/jetpack/dev/volcan.js
index 7ec208eec..7ec208eec 100644
--- a/toolkit/components/jetpack/dev/volcan.js
+++ b/components/jetpack/dev/volcan.js
diff --git a/toolkit/components/jetpack/diffpatcher/.travis.yml b/components/jetpack/diffpatcher/.travis.yml
index 780731a47..780731a47 100644
--- a/toolkit/components/jetpack/diffpatcher/.travis.yml
+++ b/components/jetpack/diffpatcher/.travis.yml
diff --git a/toolkit/components/jetpack/diffpatcher/History.md b/components/jetpack/diffpatcher/History.md
index d38978805..d38978805 100644
--- a/toolkit/components/jetpack/diffpatcher/History.md
+++ b/components/jetpack/diffpatcher/History.md
diff --git a/toolkit/components/jetpack/diffpatcher/License.md b/components/jetpack/diffpatcher/License.md
index ed76489a3..ed76489a3 100644
--- a/toolkit/components/jetpack/diffpatcher/License.md
+++ b/components/jetpack/diffpatcher/License.md
diff --git a/toolkit/components/jetpack/diffpatcher/Readme.md b/components/jetpack/diffpatcher/Readme.md
index 1520b1c37..1520b1c37 100644
--- a/toolkit/components/jetpack/diffpatcher/Readme.md
+++ b/components/jetpack/diffpatcher/Readme.md
diff --git a/toolkit/components/jetpack/diffpatcher/diff.js b/components/jetpack/diffpatcher/diff.js
index 967c137e6..967c137e6 100644
--- a/toolkit/components/jetpack/diffpatcher/diff.js
+++ b/components/jetpack/diffpatcher/diff.js
diff --git a/toolkit/components/jetpack/diffpatcher/index.js b/components/jetpack/diffpatcher/index.js
index 91ddba425..91ddba425 100644
--- a/toolkit/components/jetpack/diffpatcher/index.js
+++ b/components/jetpack/diffpatcher/index.js
diff --git a/toolkit/components/jetpack/diffpatcher/package.json b/components/jetpack/diffpatcher/package.json
index 54e085d2e..54e085d2e 100644
--- a/toolkit/components/jetpack/diffpatcher/package.json
+++ b/components/jetpack/diffpatcher/package.json
diff --git a/toolkit/components/jetpack/diffpatcher/patch.js b/components/jetpack/diffpatcher/patch.js
index 9271e8893..9271e8893 100644
--- a/toolkit/components/jetpack/diffpatcher/patch.js
+++ b/components/jetpack/diffpatcher/patch.js
diff --git a/toolkit/components/jetpack/diffpatcher/rebase.js b/components/jetpack/diffpatcher/rebase.js
index 03c756fee..03c756fee 100644
--- a/toolkit/components/jetpack/diffpatcher/rebase.js
+++ b/components/jetpack/diffpatcher/rebase.js
diff --git a/toolkit/components/jetpack/diffpatcher/test/common.js b/components/jetpack/diffpatcher/test/common.js
index dbc79013c..dbc79013c 100644
--- a/toolkit/components/jetpack/diffpatcher/test/common.js
+++ b/components/jetpack/diffpatcher/test/common.js
diff --git a/toolkit/components/jetpack/diffpatcher/test/diff.js b/components/jetpack/diffpatcher/test/diff.js
index d1d674005..d1d674005 100644
--- a/toolkit/components/jetpack/diffpatcher/test/diff.js
+++ b/components/jetpack/diffpatcher/test/diff.js
diff --git a/toolkit/components/jetpack/diffpatcher/test/index.js b/components/jetpack/diffpatcher/test/index.js
index c06407e7c..c06407e7c 100644
--- a/toolkit/components/jetpack/diffpatcher/test/index.js
+++ b/components/jetpack/diffpatcher/test/index.js
diff --git a/toolkit/components/jetpack/diffpatcher/test/patch.js b/components/jetpack/diffpatcher/test/patch.js
index dc2e38229..dc2e38229 100644
--- a/toolkit/components/jetpack/diffpatcher/test/patch.js
+++ b/components/jetpack/diffpatcher/test/patch.js
diff --git a/toolkit/components/jetpack/diffpatcher/test/tap.js b/components/jetpack/diffpatcher/test/tap.js
index e550b82f5..e550b82f5 100644
--- a/toolkit/components/jetpack/diffpatcher/test/tap.js
+++ b/components/jetpack/diffpatcher/test/tap.js
diff --git a/toolkit/components/jetpack/framescript/FrameScriptManager.jsm b/components/jetpack/framescript/FrameScriptManager.jsm
index 1ce6ceb07..1ce6ceb07 100644
--- a/toolkit/components/jetpack/framescript/FrameScriptManager.jsm
+++ b/components/jetpack/framescript/FrameScriptManager.jsm
diff --git a/toolkit/components/jetpack/framescript/content.jsm b/components/jetpack/framescript/content.jsm
index eaee26be3..eaee26be3 100644
--- a/toolkit/components/jetpack/framescript/content.jsm
+++ b/components/jetpack/framescript/content.jsm
diff --git a/toolkit/components/jetpack/framescript/context-menu.js b/components/jetpack/framescript/context-menu.js
index 3915b7cd8..3915b7cd8 100644
--- a/toolkit/components/jetpack/framescript/context-menu.js
+++ b/components/jetpack/framescript/context-menu.js
diff --git a/toolkit/components/jetpack/framescript/manager.js b/components/jetpack/framescript/manager.js
index 1f261e1fa..1f261e1fa 100644
--- a/toolkit/components/jetpack/framescript/manager.js
+++ b/components/jetpack/framescript/manager.js
diff --git a/toolkit/components/jetpack/framescript/util.js b/components/jetpack/framescript/util.js
index fb6834608..fb6834608 100644
--- a/toolkit/components/jetpack/framescript/util.js
+++ b/components/jetpack/framescript/util.js
diff --git a/toolkit/components/jetpack/index.js b/components/jetpack/index.js
index e0032240a..e0032240a 100644
--- a/toolkit/components/jetpack/index.js
+++ b/components/jetpack/index.js
diff --git a/toolkit/components/jetpack/jetpack-id/index.js b/components/jetpack/jetpack-id/index.js
index 6c1493f1d..6c1493f1d 100644
--- a/toolkit/components/jetpack/jetpack-id/index.js
+++ b/components/jetpack/jetpack-id/index.js
diff --git a/toolkit/components/jetpack/jetpack-id/package.json b/components/jetpack/jetpack-id/package.json
index 62a1c73ba..62a1c73ba 100644
--- a/toolkit/components/jetpack/jetpack-id/package.json
+++ b/components/jetpack/jetpack-id/package.json
diff --git a/toolkit/components/jetpack/method/.travis.yml b/components/jetpack/method/.travis.yml
index 780731a47..780731a47 100644
--- a/toolkit/components/jetpack/method/.travis.yml
+++ b/components/jetpack/method/.travis.yml
diff --git a/toolkit/components/jetpack/method/History.md b/components/jetpack/method/History.md
index 95258c45f..95258c45f 100644
--- a/toolkit/components/jetpack/method/History.md
+++ b/components/jetpack/method/History.md
diff --git a/toolkit/components/jetpack/method/License.md b/components/jetpack/method/License.md
index ed76489a3..ed76489a3 100644
--- a/toolkit/components/jetpack/method/License.md
+++ b/components/jetpack/method/License.md
diff --git a/toolkit/components/jetpack/method/Readme.md b/components/jetpack/method/Readme.md
index 9584c9160..9584c9160 100644
--- a/toolkit/components/jetpack/method/Readme.md
+++ b/components/jetpack/method/Readme.md
diff --git a/toolkit/components/jetpack/method/core.js b/components/jetpack/method/core.js
index a6a5261e6..a6a5261e6 100644
--- a/toolkit/components/jetpack/method/core.js
+++ b/components/jetpack/method/core.js
diff --git a/toolkit/components/jetpack/method/package.json b/components/jetpack/method/package.json
index 7bb004e28..7bb004e28 100644
--- a/toolkit/components/jetpack/method/package.json
+++ b/components/jetpack/method/package.json
diff --git a/toolkit/components/jetpack/method/test/browser.js b/components/jetpack/method/test/browser.js
index 7c8e6cd52..7c8e6cd52 100644
--- a/toolkit/components/jetpack/method/test/browser.js
+++ b/components/jetpack/method/test/browser.js
diff --git a/toolkit/components/jetpack/method/test/common.js b/components/jetpack/method/test/common.js
index 0418c3a23..0418c3a23 100644
--- a/toolkit/components/jetpack/method/test/common.js
+++ b/components/jetpack/method/test/common.js
diff --git a/toolkit/components/jetpack/modules/system/Startup.js b/components/jetpack/modules/system/Startup.js
index 89eeac3bc..89eeac3bc 100644
--- a/toolkit/components/jetpack/modules/system/Startup.js
+++ b/components/jetpack/modules/system/Startup.js
diff --git a/toolkit/components/jetpack/modules/system/moz.build b/components/jetpack/modules/system/moz.build
index b15ad453a..b15ad453a 100644
--- a/toolkit/components/jetpack/modules/system/moz.build
+++ b/components/jetpack/modules/system/moz.build
diff --git a/toolkit/components/jetpack/moz.build b/components/jetpack/moz.build
index f07319ad9..f07319ad9 100644
--- a/toolkit/components/jetpack/moz.build
+++ b/components/jetpack/moz.build
diff --git a/toolkit/components/jetpack/mozilla-toolkit-versioning/index.js b/components/jetpack/mozilla-toolkit-versioning/index.js
index 2f607c880..2f607c880 100644
--- a/toolkit/components/jetpack/mozilla-toolkit-versioning/index.js
+++ b/components/jetpack/mozilla-toolkit-versioning/index.js
diff --git a/toolkit/components/jetpack/mozilla-toolkit-versioning/lib/utils.js b/components/jetpack/mozilla-toolkit-versioning/lib/utils.js
index e068085c0..e068085c0 100644
--- a/toolkit/components/jetpack/mozilla-toolkit-versioning/lib/utils.js
+++ b/components/jetpack/mozilla-toolkit-versioning/lib/utils.js
diff --git a/toolkit/components/jetpack/mozilla-toolkit-versioning/package.json b/components/jetpack/mozilla-toolkit-versioning/package.json
index d9b0424e5..d9b0424e5 100644
--- a/toolkit/components/jetpack/mozilla-toolkit-versioning/package.json
+++ b/components/jetpack/mozilla-toolkit-versioning/package.json
diff --git a/toolkit/components/jetpack/node/os.js b/components/jetpack/node/os.js
index 1c41a9246..1c41a9246 100644
--- a/toolkit/components/jetpack/node/os.js
+++ b/components/jetpack/node/os.js
diff --git a/toolkit/components/jetpack/sdk/addon/bootstrap.js b/components/jetpack/sdk/addon/bootstrap.js
index a6055bd10..a6055bd10 100644
--- a/toolkit/components/jetpack/sdk/addon/bootstrap.js
+++ b/components/jetpack/sdk/addon/bootstrap.js
diff --git a/toolkit/components/jetpack/sdk/addon/events.js b/components/jetpack/sdk/addon/events.js
index 45bada6e1..45bada6e1 100644
--- a/toolkit/components/jetpack/sdk/addon/events.js
+++ b/components/jetpack/sdk/addon/events.js
diff --git a/toolkit/components/jetpack/sdk/addon/host.js b/components/jetpack/sdk/addon/host.js
index 91aa0e869..91aa0e869 100644
--- a/toolkit/components/jetpack/sdk/addon/host.js
+++ b/components/jetpack/sdk/addon/host.js
diff --git a/toolkit/components/jetpack/sdk/addon/installer.js b/components/jetpack/sdk/addon/installer.js
index bb8cf8d16..bb8cf8d16 100644
--- a/toolkit/components/jetpack/sdk/addon/installer.js
+++ b/components/jetpack/sdk/addon/installer.js
diff --git a/toolkit/components/jetpack/sdk/addon/manager.js b/components/jetpack/sdk/addon/manager.js
index 7ac0a7d6e..7ac0a7d6e 100644
--- a/toolkit/components/jetpack/sdk/addon/manager.js
+++ b/components/jetpack/sdk/addon/manager.js
diff --git a/toolkit/components/jetpack/sdk/addon/runner.js b/components/jetpack/sdk/addon/runner.js
index 3977a04e4..3977a04e4 100644
--- a/toolkit/components/jetpack/sdk/addon/runner.js
+++ b/components/jetpack/sdk/addon/runner.js
diff --git a/toolkit/components/jetpack/sdk/addon/window.js b/components/jetpack/sdk/addon/window.js
index 93ed1d8dc..93ed1d8dc 100644
--- a/toolkit/components/jetpack/sdk/addon/window.js
+++ b/components/jetpack/sdk/addon/window.js
diff --git a/toolkit/components/jetpack/sdk/base64.js b/components/jetpack/sdk/base64.js
index a07b302e0..a07b302e0 100644
--- a/toolkit/components/jetpack/sdk/base64.js
+++ b/components/jetpack/sdk/base64.js
diff --git a/toolkit/components/jetpack/sdk/browser/events.js b/components/jetpack/sdk/browser/events.js
index f91119031..f91119031 100644
--- a/toolkit/components/jetpack/sdk/browser/events.js
+++ b/components/jetpack/sdk/browser/events.js
diff --git a/toolkit/components/jetpack/sdk/clipboard.js b/components/jetpack/sdk/clipboard.js
index c6b3c46fe..c6b3c46fe 100644
--- a/toolkit/components/jetpack/sdk/clipboard.js
+++ b/components/jetpack/sdk/clipboard.js
diff --git a/toolkit/components/jetpack/sdk/console/plain-text.js b/components/jetpack/sdk/console/plain-text.js
index 0e44cf106..0e44cf106 100644
--- a/toolkit/components/jetpack/sdk/console/plain-text.js
+++ b/components/jetpack/sdk/console/plain-text.js
diff --git a/toolkit/components/jetpack/sdk/console/traceback.js b/components/jetpack/sdk/console/traceback.js
index be0fb7b94..be0fb7b94 100644
--- a/toolkit/components/jetpack/sdk/console/traceback.js
+++ b/components/jetpack/sdk/console/traceback.js
diff --git a/toolkit/components/jetpack/sdk/content/content-worker.js b/components/jetpack/sdk/content/content-worker.js
index 0a8225733..0a8225733 100644
--- a/toolkit/components/jetpack/sdk/content/content-worker.js
+++ b/components/jetpack/sdk/content/content-worker.js
diff --git a/toolkit/components/jetpack/sdk/content/content.js b/components/jetpack/sdk/content/content.js
index 9655223a3..9655223a3 100644
--- a/toolkit/components/jetpack/sdk/content/content.js
+++ b/components/jetpack/sdk/content/content.js
diff --git a/toolkit/components/jetpack/sdk/content/context-menu.js b/components/jetpack/sdk/content/context-menu.js
index 2955e2f09..2955e2f09 100644
--- a/toolkit/components/jetpack/sdk/content/context-menu.js
+++ b/components/jetpack/sdk/content/context-menu.js
diff --git a/toolkit/components/jetpack/sdk/content/events.js b/components/jetpack/sdk/content/events.js
index c085b6179..c085b6179 100644
--- a/toolkit/components/jetpack/sdk/content/events.js
+++ b/components/jetpack/sdk/content/events.js
diff --git a/toolkit/components/jetpack/sdk/content/l10n-html.js b/components/jetpack/sdk/content/l10n-html.js
index f324623dc..f324623dc 100644
--- a/toolkit/components/jetpack/sdk/content/l10n-html.js
+++ b/components/jetpack/sdk/content/l10n-html.js
diff --git a/toolkit/components/jetpack/sdk/content/loader.js b/components/jetpack/sdk/content/loader.js
index e4f0dd2aa..e4f0dd2aa 100644
--- a/toolkit/components/jetpack/sdk/content/loader.js
+++ b/components/jetpack/sdk/content/loader.js
diff --git a/toolkit/components/jetpack/sdk/content/mod.js b/components/jetpack/sdk/content/mod.js
index 81fe9ee42..81fe9ee42 100644
--- a/toolkit/components/jetpack/sdk/content/mod.js
+++ b/components/jetpack/sdk/content/mod.js
diff --git a/toolkit/components/jetpack/sdk/content/page-mod.js b/components/jetpack/sdk/content/page-mod.js
index 8ff9b1e7b..8ff9b1e7b 100644
--- a/toolkit/components/jetpack/sdk/content/page-mod.js
+++ b/components/jetpack/sdk/content/page-mod.js
diff --git a/toolkit/components/jetpack/sdk/content/page-worker.js b/components/jetpack/sdk/content/page-worker.js
index e9e741120..e9e741120 100644
--- a/toolkit/components/jetpack/sdk/content/page-worker.js
+++ b/components/jetpack/sdk/content/page-worker.js
diff --git a/toolkit/components/jetpack/sdk/content/sandbox.js b/components/jetpack/sdk/content/sandbox.js
index 096ba5c87..096ba5c87 100644
--- a/toolkit/components/jetpack/sdk/content/sandbox.js
+++ b/components/jetpack/sdk/content/sandbox.js
diff --git a/toolkit/components/jetpack/sdk/content/sandbox/events.js b/components/jetpack/sdk/content/sandbox/events.js
index d6f7eb004..d6f7eb004 100644
--- a/toolkit/components/jetpack/sdk/content/sandbox/events.js
+++ b/components/jetpack/sdk/content/sandbox/events.js
diff --git a/toolkit/components/jetpack/sdk/content/tab-events.js b/components/jetpack/sdk/content/tab-events.js
index 9e244a853..9e244a853 100644
--- a/toolkit/components/jetpack/sdk/content/tab-events.js
+++ b/components/jetpack/sdk/content/tab-events.js
diff --git a/toolkit/components/jetpack/sdk/content/thumbnail.js b/components/jetpack/sdk/content/thumbnail.js
index 783615fc6..783615fc6 100644
--- a/toolkit/components/jetpack/sdk/content/thumbnail.js
+++ b/components/jetpack/sdk/content/thumbnail.js
diff --git a/toolkit/components/jetpack/sdk/content/utils.js b/components/jetpack/sdk/content/utils.js
index 90995a614..90995a614 100644
--- a/toolkit/components/jetpack/sdk/content/utils.js
+++ b/components/jetpack/sdk/content/utils.js
diff --git a/toolkit/components/jetpack/sdk/content/worker-child.js b/components/jetpack/sdk/content/worker-child.js
index dbf65a933..dbf65a933 100644
--- a/toolkit/components/jetpack/sdk/content/worker-child.js
+++ b/components/jetpack/sdk/content/worker-child.js
diff --git a/toolkit/components/jetpack/sdk/content/worker.js b/components/jetpack/sdk/content/worker.js
index 39b940a88..39b940a88 100644
--- a/toolkit/components/jetpack/sdk/content/worker.js
+++ b/components/jetpack/sdk/content/worker.js
diff --git a/toolkit/components/jetpack/sdk/context-menu.js b/components/jetpack/sdk/context-menu.js
index e00f41d79..e00f41d79 100644
--- a/toolkit/components/jetpack/sdk/context-menu.js
+++ b/components/jetpack/sdk/context-menu.js
diff --git a/toolkit/components/jetpack/sdk/context-menu/context.js b/components/jetpack/sdk/context-menu/context.js
index fc5aea500..fc5aea500 100644
--- a/toolkit/components/jetpack/sdk/context-menu/context.js
+++ b/components/jetpack/sdk/context-menu/context.js
diff --git a/toolkit/components/jetpack/sdk/context-menu/core.js b/components/jetpack/sdk/context-menu/core.js
index c64cddfe8..c64cddfe8 100644
--- a/toolkit/components/jetpack/sdk/context-menu/core.js
+++ b/components/jetpack/sdk/context-menu/core.js
diff --git a/toolkit/components/jetpack/sdk/context-menu/readers.js b/components/jetpack/sdk/context-menu/readers.js
index 5078f8f29..5078f8f29 100644
--- a/toolkit/components/jetpack/sdk/context-menu/readers.js
+++ b/components/jetpack/sdk/context-menu/readers.js
diff --git a/toolkit/components/jetpack/sdk/context-menu@2.js b/components/jetpack/sdk/context-menu@2.js
index 45ad804e9..45ad804e9 100644
--- a/toolkit/components/jetpack/sdk/context-menu@2.js
+++ b/components/jetpack/sdk/context-menu@2.js
diff --git a/toolkit/components/jetpack/sdk/core/disposable.js b/components/jetpack/sdk/core/disposable.js
index 19f7eaa9f..19f7eaa9f 100644
--- a/toolkit/components/jetpack/sdk/core/disposable.js
+++ b/components/jetpack/sdk/core/disposable.js
diff --git a/toolkit/components/jetpack/sdk/core/heritage.js b/components/jetpack/sdk/core/heritage.js
index fc87ba1f5..fc87ba1f5 100644
--- a/toolkit/components/jetpack/sdk/core/heritage.js
+++ b/components/jetpack/sdk/core/heritage.js
diff --git a/toolkit/components/jetpack/sdk/core/namespace.js b/components/jetpack/sdk/core/namespace.js
index 3ceb73b72..3ceb73b72 100644
--- a/toolkit/components/jetpack/sdk/core/namespace.js
+++ b/components/jetpack/sdk/core/namespace.js
diff --git a/toolkit/components/jetpack/sdk/core/observer.js b/components/jetpack/sdk/core/observer.js
index 7e11bf8f9..7e11bf8f9 100644
--- a/toolkit/components/jetpack/sdk/core/observer.js
+++ b/components/jetpack/sdk/core/observer.js
diff --git a/toolkit/components/jetpack/sdk/core/promise.js b/components/jetpack/sdk/core/promise.js
index f4bd7b0f5..f4bd7b0f5 100644
--- a/toolkit/components/jetpack/sdk/core/promise.js
+++ b/components/jetpack/sdk/core/promise.js
diff --git a/toolkit/components/jetpack/sdk/core/reference.js b/components/jetpack/sdk/core/reference.js
index 04549cd0f..04549cd0f 100644
--- a/toolkit/components/jetpack/sdk/core/reference.js
+++ b/components/jetpack/sdk/core/reference.js
diff --git a/toolkit/components/jetpack/sdk/deprecated/api-utils.js b/components/jetpack/sdk/deprecated/api-utils.js
index 856fc50cb..856fc50cb 100644
--- a/toolkit/components/jetpack/sdk/deprecated/api-utils.js
+++ b/components/jetpack/sdk/deprecated/api-utils.js
diff --git a/toolkit/components/jetpack/sdk/deprecated/events/assembler.js b/components/jetpack/sdk/deprecated/events/assembler.js
index bb297c24f..bb297c24f 100644
--- a/toolkit/components/jetpack/sdk/deprecated/events/assembler.js
+++ b/components/jetpack/sdk/deprecated/events/assembler.js
diff --git a/toolkit/components/jetpack/sdk/deprecated/sync-worker.js b/components/jetpack/sdk/deprecated/sync-worker.js
index 71cadac36..71cadac36 100644
--- a/toolkit/components/jetpack/sdk/deprecated/sync-worker.js
+++ b/components/jetpack/sdk/deprecated/sync-worker.js
diff --git a/toolkit/components/jetpack/sdk/deprecated/unit-test-finder.js b/components/jetpack/sdk/deprecated/unit-test-finder.js
index e38629f45..e38629f45 100644
--- a/toolkit/components/jetpack/sdk/deprecated/unit-test-finder.js
+++ b/components/jetpack/sdk/deprecated/unit-test-finder.js
diff --git a/toolkit/components/jetpack/sdk/deprecated/unit-test.js b/components/jetpack/sdk/deprecated/unit-test.js
index 32bba8f6b..32bba8f6b 100644
--- a/toolkit/components/jetpack/sdk/deprecated/unit-test.js
+++ b/components/jetpack/sdk/deprecated/unit-test.js
diff --git a/toolkit/components/jetpack/sdk/deprecated/window-utils.js b/components/jetpack/sdk/deprecated/window-utils.js
index 93c0ab7b8..93c0ab7b8 100644
--- a/toolkit/components/jetpack/sdk/deprecated/window-utils.js
+++ b/components/jetpack/sdk/deprecated/window-utils.js
diff --git a/toolkit/components/jetpack/sdk/dom/events-shimmed.js b/components/jetpack/sdk/dom/events-shimmed.js
index 7a1727681..7a1727681 100644
--- a/toolkit/components/jetpack/sdk/dom/events-shimmed.js
+++ b/components/jetpack/sdk/dom/events-shimmed.js
diff --git a/toolkit/components/jetpack/sdk/dom/events.js b/components/jetpack/sdk/dom/events.js
index 502d2350f..502d2350f 100644
--- a/toolkit/components/jetpack/sdk/dom/events.js
+++ b/components/jetpack/sdk/dom/events.js
diff --git a/toolkit/components/jetpack/sdk/dom/events/keys.js b/components/jetpack/sdk/dom/events/keys.js
index e6f1483a2..e6f1483a2 100644
--- a/toolkit/components/jetpack/sdk/dom/events/keys.js
+++ b/components/jetpack/sdk/dom/events/keys.js
diff --git a/toolkit/components/jetpack/sdk/event/chrome.js b/components/jetpack/sdk/event/chrome.js
index 9044fef99..9044fef99 100644
--- a/toolkit/components/jetpack/sdk/event/chrome.js
+++ b/components/jetpack/sdk/event/chrome.js
diff --git a/toolkit/components/jetpack/sdk/event/core.js b/components/jetpack/sdk/event/core.js
index c16dd2df5..c16dd2df5 100644
--- a/toolkit/components/jetpack/sdk/event/core.js
+++ b/components/jetpack/sdk/event/core.js
diff --git a/toolkit/components/jetpack/sdk/event/dom.js b/components/jetpack/sdk/event/dom.js
index da99dec7a..da99dec7a 100644
--- a/toolkit/components/jetpack/sdk/event/dom.js
+++ b/components/jetpack/sdk/event/dom.js
diff --git a/toolkit/components/jetpack/sdk/event/target.js b/components/jetpack/sdk/event/target.js
index 3a1f5e5f0..3a1f5e5f0 100644
--- a/toolkit/components/jetpack/sdk/event/target.js
+++ b/components/jetpack/sdk/event/target.js
diff --git a/toolkit/components/jetpack/sdk/event/utils.js b/components/jetpack/sdk/event/utils.js
index f193b6785..f193b6785 100644
--- a/toolkit/components/jetpack/sdk/event/utils.js
+++ b/components/jetpack/sdk/event/utils.js
diff --git a/toolkit/components/jetpack/sdk/frame/hidden-frame.js b/components/jetpack/sdk/frame/hidden-frame.js
index 97e0b7974..97e0b7974 100644
--- a/toolkit/components/jetpack/sdk/frame/hidden-frame.js
+++ b/components/jetpack/sdk/frame/hidden-frame.js
diff --git a/toolkit/components/jetpack/sdk/frame/utils.js b/components/jetpack/sdk/frame/utils.js
index d9fccec4d..d9fccec4d 100644
--- a/toolkit/components/jetpack/sdk/frame/utils.js
+++ b/components/jetpack/sdk/frame/utils.js
diff --git a/toolkit/components/jetpack/sdk/fs/path.js b/components/jetpack/sdk/fs/path.js
index 4474b2b4a..4474b2b4a 100644
--- a/toolkit/components/jetpack/sdk/fs/path.js
+++ b/components/jetpack/sdk/fs/path.js
diff --git a/toolkit/components/jetpack/sdk/hotkeys.js b/components/jetpack/sdk/hotkeys.js
index 00081455e..00081455e 100644
--- a/toolkit/components/jetpack/sdk/hotkeys.js
+++ b/components/jetpack/sdk/hotkeys.js
diff --git a/toolkit/components/jetpack/sdk/indexed-db.js b/components/jetpack/sdk/indexed-db.js
index d4d166c02..d4d166c02 100644
--- a/toolkit/components/jetpack/sdk/indexed-db.js
+++ b/components/jetpack/sdk/indexed-db.js
diff --git a/toolkit/components/jetpack/sdk/input/browser.js b/components/jetpack/sdk/input/browser.js
index daea875bf..daea875bf 100644
--- a/toolkit/components/jetpack/sdk/input/browser.js
+++ b/components/jetpack/sdk/input/browser.js
diff --git a/toolkit/components/jetpack/sdk/input/customizable-ui.js b/components/jetpack/sdk/input/customizable-ui.js
index a41d0971a..a41d0971a 100644
--- a/toolkit/components/jetpack/sdk/input/customizable-ui.js
+++ b/components/jetpack/sdk/input/customizable-ui.js
diff --git a/toolkit/components/jetpack/sdk/input/frame.js b/components/jetpack/sdk/input/frame.js
index 50efaa745..50efaa745 100644
--- a/toolkit/components/jetpack/sdk/input/frame.js
+++ b/components/jetpack/sdk/input/frame.js
diff --git a/toolkit/components/jetpack/sdk/input/system.js b/components/jetpack/sdk/input/system.js
index 66bc6daec..66bc6daec 100644
--- a/toolkit/components/jetpack/sdk/input/system.js
+++ b/components/jetpack/sdk/input/system.js
diff --git a/toolkit/components/jetpack/sdk/io/buffer.js b/components/jetpack/sdk/io/buffer.js
index 5ea169402..5ea169402 100644
--- a/toolkit/components/jetpack/sdk/io/buffer.js
+++ b/components/jetpack/sdk/io/buffer.js
diff --git a/toolkit/components/jetpack/sdk/io/byte-streams.js b/components/jetpack/sdk/io/byte-streams.js
index 6afab4369..6afab4369 100644
--- a/toolkit/components/jetpack/sdk/io/byte-streams.js
+++ b/components/jetpack/sdk/io/byte-streams.js
diff --git a/toolkit/components/jetpack/sdk/io/file.js b/components/jetpack/sdk/io/file.js
index 47467df87..47467df87 100644
--- a/toolkit/components/jetpack/sdk/io/file.js
+++ b/components/jetpack/sdk/io/file.js
diff --git a/toolkit/components/jetpack/sdk/io/fs.js b/components/jetpack/sdk/io/fs.js
index 860a884a5..860a884a5 100644
--- a/toolkit/components/jetpack/sdk/io/fs.js
+++ b/components/jetpack/sdk/io/fs.js
diff --git a/toolkit/components/jetpack/sdk/io/stream.js b/components/jetpack/sdk/io/stream.js
index 0698b8e32..0698b8e32 100644
--- a/toolkit/components/jetpack/sdk/io/stream.js
+++ b/components/jetpack/sdk/io/stream.js
diff --git a/toolkit/components/jetpack/sdk/io/text-streams.js b/components/jetpack/sdk/io/text-streams.js
index ed4ec4972..ed4ec4972 100644
--- a/toolkit/components/jetpack/sdk/io/text-streams.js
+++ b/components/jetpack/sdk/io/text-streams.js
diff --git a/toolkit/components/jetpack/sdk/keyboard/hotkeys.js b/components/jetpack/sdk/keyboard/hotkeys.js
index a179502b8..a179502b8 100644
--- a/toolkit/components/jetpack/sdk/keyboard/hotkeys.js
+++ b/components/jetpack/sdk/keyboard/hotkeys.js
diff --git a/toolkit/components/jetpack/sdk/keyboard/observer.js b/components/jetpack/sdk/keyboard/observer.js
index b8e32b95c..b8e32b95c 100644
--- a/toolkit/components/jetpack/sdk/keyboard/observer.js
+++ b/components/jetpack/sdk/keyboard/observer.js
diff --git a/toolkit/components/jetpack/sdk/keyboard/utils.js b/components/jetpack/sdk/keyboard/utils.js
index 1b7df4ce3..1b7df4ce3 100644
--- a/toolkit/components/jetpack/sdk/keyboard/utils.js
+++ b/components/jetpack/sdk/keyboard/utils.js
diff --git a/toolkit/components/jetpack/sdk/l10n.js b/components/jetpack/sdk/l10n.js
index db5a9d7b6..db5a9d7b6 100644
--- a/toolkit/components/jetpack/sdk/l10n.js
+++ b/components/jetpack/sdk/l10n.js
diff --git a/toolkit/components/jetpack/sdk/l10n/core.js b/components/jetpack/sdk/l10n/core.js
index 2f8f84c04..2f8f84c04 100644
--- a/toolkit/components/jetpack/sdk/l10n/core.js
+++ b/components/jetpack/sdk/l10n/core.js
diff --git a/toolkit/components/jetpack/sdk/l10n/html.js b/components/jetpack/sdk/l10n/html.js
index fa2cf9cf0..fa2cf9cf0 100644
--- a/toolkit/components/jetpack/sdk/l10n/html.js
+++ b/components/jetpack/sdk/l10n/html.js
diff --git a/toolkit/components/jetpack/sdk/l10n/json/core.js b/components/jetpack/sdk/l10n/json/core.js
index af52f956f..af52f956f 100644
--- a/toolkit/components/jetpack/sdk/l10n/json/core.js
+++ b/components/jetpack/sdk/l10n/json/core.js
diff --git a/toolkit/components/jetpack/sdk/l10n/loader.js b/components/jetpack/sdk/l10n/loader.js
index 60e219e44..60e219e44 100644
--- a/toolkit/components/jetpack/sdk/l10n/loader.js
+++ b/components/jetpack/sdk/l10n/loader.js
diff --git a/toolkit/components/jetpack/sdk/l10n/locale.js b/components/jetpack/sdk/l10n/locale.js
index 950b33b20..950b33b20 100644
--- a/toolkit/components/jetpack/sdk/l10n/locale.js
+++ b/components/jetpack/sdk/l10n/locale.js
diff --git a/toolkit/components/jetpack/sdk/l10n/plural-rules.js b/components/jetpack/sdk/l10n/plural-rules.js
index a3ef48a5e..a3ef48a5e 100644
--- a/toolkit/components/jetpack/sdk/l10n/plural-rules.js
+++ b/components/jetpack/sdk/l10n/plural-rules.js
diff --git a/toolkit/components/jetpack/sdk/l10n/prefs.js b/components/jetpack/sdk/l10n/prefs.js
index 8ee26fc5b..8ee26fc5b 100644
--- a/toolkit/components/jetpack/sdk/l10n/prefs.js
+++ b/components/jetpack/sdk/l10n/prefs.js
diff --git a/toolkit/components/jetpack/sdk/l10n/properties/core.js b/components/jetpack/sdk/l10n/properties/core.js
index 7a9081d0b..7a9081d0b 100644
--- a/toolkit/components/jetpack/sdk/l10n/properties/core.js
+++ b/components/jetpack/sdk/l10n/properties/core.js
diff --git a/toolkit/components/jetpack/sdk/lang/functional.js b/components/jetpack/sdk/lang/functional.js
index 66e30edfa..66e30edfa 100644
--- a/toolkit/components/jetpack/sdk/lang/functional.js
+++ b/components/jetpack/sdk/lang/functional.js
diff --git a/toolkit/components/jetpack/sdk/lang/functional/concurrent.js b/components/jetpack/sdk/lang/functional/concurrent.js
index 85e8cff46..85e8cff46 100644
--- a/toolkit/components/jetpack/sdk/lang/functional/concurrent.js
+++ b/components/jetpack/sdk/lang/functional/concurrent.js
diff --git a/toolkit/components/jetpack/sdk/lang/functional/core.js b/components/jetpack/sdk/lang/functional/core.js
index 0d9143364..0d9143364 100644
--- a/toolkit/components/jetpack/sdk/lang/functional/core.js
+++ b/components/jetpack/sdk/lang/functional/core.js
diff --git a/toolkit/components/jetpack/sdk/lang/functional/helpers.js b/components/jetpack/sdk/lang/functional/helpers.js
index 60f4e3300..60f4e3300 100644
--- a/toolkit/components/jetpack/sdk/lang/functional/helpers.js
+++ b/components/jetpack/sdk/lang/functional/helpers.js
diff --git a/toolkit/components/jetpack/sdk/lang/type.js b/components/jetpack/sdk/lang/type.js
index b50e6be4c..b50e6be4c 100644
--- a/toolkit/components/jetpack/sdk/lang/type.js
+++ b/components/jetpack/sdk/lang/type.js
diff --git a/toolkit/components/jetpack/sdk/lang/weak-set.js b/components/jetpack/sdk/lang/weak-set.js
index 0b81a395b..0b81a395b 100644
--- a/toolkit/components/jetpack/sdk/lang/weak-set.js
+++ b/components/jetpack/sdk/lang/weak-set.js
diff --git a/toolkit/components/jetpack/sdk/loader/cuddlefish.js b/components/jetpack/sdk/loader/cuddlefish.js
index 6ba19157b..6ba19157b 100644
--- a/toolkit/components/jetpack/sdk/loader/cuddlefish.js
+++ b/components/jetpack/sdk/loader/cuddlefish.js
diff --git a/toolkit/components/jetpack/sdk/loader/sandbox.js b/components/jetpack/sdk/loader/sandbox.js
index 791dbc086..791dbc086 100644
--- a/toolkit/components/jetpack/sdk/loader/sandbox.js
+++ b/components/jetpack/sdk/loader/sandbox.js
diff --git a/toolkit/components/jetpack/sdk/messaging.js b/components/jetpack/sdk/messaging.js
index 07580eb33..07580eb33 100644
--- a/toolkit/components/jetpack/sdk/messaging.js
+++ b/components/jetpack/sdk/messaging.js
diff --git a/toolkit/components/jetpack/sdk/model/core.js b/components/jetpack/sdk/model/core.js
index 315f8b1cd..315f8b1cd 100644
--- a/toolkit/components/jetpack/sdk/model/core.js
+++ b/components/jetpack/sdk/model/core.js
diff --git a/toolkit/components/jetpack/sdk/net/url.js b/components/jetpack/sdk/net/url.js
index 5502171ee..5502171ee 100644
--- a/toolkit/components/jetpack/sdk/net/url.js
+++ b/components/jetpack/sdk/net/url.js
diff --git a/toolkit/components/jetpack/sdk/net/xhr.js b/components/jetpack/sdk/net/xhr.js
index 415b9cbf4..415b9cbf4 100644
--- a/toolkit/components/jetpack/sdk/net/xhr.js
+++ b/components/jetpack/sdk/net/xhr.js
diff --git a/toolkit/components/jetpack/sdk/notifications.js b/components/jetpack/sdk/notifications.js
index 752e08fb1..752e08fb1 100644
--- a/toolkit/components/jetpack/sdk/notifications.js
+++ b/components/jetpack/sdk/notifications.js
diff --git a/toolkit/components/jetpack/sdk/output/system.js b/components/jetpack/sdk/output/system.js
index 4fb16dcd5..4fb16dcd5 100644
--- a/toolkit/components/jetpack/sdk/output/system.js
+++ b/components/jetpack/sdk/output/system.js
diff --git a/toolkit/components/jetpack/sdk/page-mod.js b/components/jetpack/sdk/page-mod.js
index 538be2732..538be2732 100644
--- a/toolkit/components/jetpack/sdk/page-mod.js
+++ b/components/jetpack/sdk/page-mod.js
diff --git a/toolkit/components/jetpack/sdk/page-mod/match-pattern.js b/components/jetpack/sdk/page-mod/match-pattern.js
index afbbd401e..afbbd401e 100644
--- a/toolkit/components/jetpack/sdk/page-mod/match-pattern.js
+++ b/components/jetpack/sdk/page-mod/match-pattern.js
diff --git a/toolkit/components/jetpack/sdk/page-worker.js b/components/jetpack/sdk/page-worker.js
index 837cf774b..837cf774b 100644
--- a/toolkit/components/jetpack/sdk/page-worker.js
+++ b/components/jetpack/sdk/page-worker.js
diff --git a/toolkit/components/jetpack/sdk/panel.js b/components/jetpack/sdk/panel.js
index 34cde2edd..34cde2edd 100644
--- a/toolkit/components/jetpack/sdk/panel.js
+++ b/components/jetpack/sdk/panel.js
diff --git a/toolkit/components/jetpack/sdk/panel/events.js b/components/jetpack/sdk/panel/events.js
index f3040a11d..f3040a11d 100644
--- a/toolkit/components/jetpack/sdk/panel/events.js
+++ b/components/jetpack/sdk/panel/events.js
diff --git a/toolkit/components/jetpack/sdk/panel/utils.js b/components/jetpack/sdk/panel/utils.js
index c85b274bc..c85b274bc 100644
--- a/toolkit/components/jetpack/sdk/panel/utils.js
+++ b/components/jetpack/sdk/panel/utils.js
diff --git a/toolkit/components/jetpack/sdk/passwords.js b/components/jetpack/sdk/passwords.js
index 70f0aa4da..70f0aa4da 100644
--- a/toolkit/components/jetpack/sdk/passwords.js
+++ b/components/jetpack/sdk/passwords.js
diff --git a/toolkit/components/jetpack/sdk/passwords/utils.js b/components/jetpack/sdk/passwords/utils.js
index 334efa490..334efa490 100644
--- a/toolkit/components/jetpack/sdk/passwords/utils.js
+++ b/components/jetpack/sdk/passwords/utils.js
diff --git a/toolkit/components/jetpack/sdk/places/bookmarks.js b/components/jetpack/sdk/places/bookmarks.js
index e8fdae4f4..e8fdae4f4 100644
--- a/toolkit/components/jetpack/sdk/places/bookmarks.js
+++ b/components/jetpack/sdk/places/bookmarks.js
diff --git a/toolkit/components/jetpack/sdk/places/contract.js b/components/jetpack/sdk/places/contract.js
index a3541c34d..a3541c34d 100644
--- a/toolkit/components/jetpack/sdk/places/contract.js
+++ b/components/jetpack/sdk/places/contract.js
diff --git a/toolkit/components/jetpack/sdk/places/events.js b/components/jetpack/sdk/places/events.js
index c5e728039..c5e728039 100644
--- a/toolkit/components/jetpack/sdk/places/events.js
+++ b/components/jetpack/sdk/places/events.js
diff --git a/toolkit/components/jetpack/sdk/places/favicon.js b/components/jetpack/sdk/places/favicon.js
index 7a74aa517..7a74aa517 100644
--- a/toolkit/components/jetpack/sdk/places/favicon.js
+++ b/components/jetpack/sdk/places/favicon.js
diff --git a/toolkit/components/jetpack/sdk/places/history.js b/components/jetpack/sdk/places/history.js
index f7fc3ed57..f7fc3ed57 100644
--- a/toolkit/components/jetpack/sdk/places/history.js
+++ b/components/jetpack/sdk/places/history.js
diff --git a/toolkit/components/jetpack/sdk/places/host/host-bookmarks.js b/components/jetpack/sdk/places/host/host-bookmarks.js
index f6dec4069..f6dec4069 100644
--- a/toolkit/components/jetpack/sdk/places/host/host-bookmarks.js
+++ b/components/jetpack/sdk/places/host/host-bookmarks.js
diff --git a/toolkit/components/jetpack/sdk/places/host/host-query.js b/components/jetpack/sdk/places/host/host-query.js
index a2cd4cd35..a2cd4cd35 100644
--- a/toolkit/components/jetpack/sdk/places/host/host-query.js
+++ b/components/jetpack/sdk/places/host/host-query.js
diff --git a/toolkit/components/jetpack/sdk/places/host/host-tags.js b/components/jetpack/sdk/places/host/host-tags.js
index b94342549..b94342549 100644
--- a/toolkit/components/jetpack/sdk/places/host/host-tags.js
+++ b/components/jetpack/sdk/places/host/host-tags.js
diff --git a/toolkit/components/jetpack/sdk/places/utils.js b/components/jetpack/sdk/places/utils.js
index fe928c4ea..fe928c4ea 100644
--- a/toolkit/components/jetpack/sdk/places/utils.js
+++ b/components/jetpack/sdk/places/utils.js
diff --git a/toolkit/components/jetpack/sdk/platform/xpcom.js b/components/jetpack/sdk/platform/xpcom.js
index 383baf67a..383baf67a 100644
--- a/toolkit/components/jetpack/sdk/platform/xpcom.js
+++ b/components/jetpack/sdk/platform/xpcom.js
diff --git a/toolkit/components/jetpack/sdk/preferences/event-target.js b/components/jetpack/sdk/preferences/event-target.js
index b64ba303c..b64ba303c 100644
--- a/toolkit/components/jetpack/sdk/preferences/event-target.js
+++ b/components/jetpack/sdk/preferences/event-target.js
diff --git a/toolkit/components/jetpack/sdk/preferences/native-options.js b/components/jetpack/sdk/preferences/native-options.js
index 840997df9..840997df9 100644
--- a/toolkit/components/jetpack/sdk/preferences/native-options.js
+++ b/components/jetpack/sdk/preferences/native-options.js
diff --git a/toolkit/components/jetpack/sdk/preferences/service.js b/components/jetpack/sdk/preferences/service.js
index 231cd8e14..231cd8e14 100644
--- a/toolkit/components/jetpack/sdk/preferences/service.js
+++ b/components/jetpack/sdk/preferences/service.js
diff --git a/toolkit/components/jetpack/sdk/preferences/utils.js b/components/jetpack/sdk/preferences/utils.js
index 1d5769c37..1d5769c37 100644
--- a/toolkit/components/jetpack/sdk/preferences/utils.js
+++ b/components/jetpack/sdk/preferences/utils.js
diff --git a/toolkit/components/jetpack/sdk/private-browsing.js b/components/jetpack/sdk/private-browsing.js
index 29ca16185..29ca16185 100644
--- a/toolkit/components/jetpack/sdk/private-browsing.js
+++ b/components/jetpack/sdk/private-browsing.js
diff --git a/toolkit/components/jetpack/sdk/private-browsing/utils.js b/components/jetpack/sdk/private-browsing/utils.js
index 8b012f0ce..8b012f0ce 100644
--- a/toolkit/components/jetpack/sdk/private-browsing/utils.js
+++ b/components/jetpack/sdk/private-browsing/utils.js
diff --git a/toolkit/components/jetpack/sdk/querystring.js b/components/jetpack/sdk/querystring.js
index 9982a00ab..9982a00ab 100644
--- a/toolkit/components/jetpack/sdk/querystring.js
+++ b/components/jetpack/sdk/querystring.js
diff --git a/toolkit/components/jetpack/sdk/remote/child.js b/components/jetpack/sdk/remote/child.js
index 4ccfa661a..4ccfa661a 100644
--- a/toolkit/components/jetpack/sdk/remote/child.js
+++ b/components/jetpack/sdk/remote/child.js
diff --git a/toolkit/components/jetpack/sdk/remote/core.js b/components/jetpack/sdk/remote/core.js
index 78bb673fd..78bb673fd 100644
--- a/toolkit/components/jetpack/sdk/remote/core.js
+++ b/components/jetpack/sdk/remote/core.js
diff --git a/toolkit/components/jetpack/sdk/remote/parent.js b/components/jetpack/sdk/remote/parent.js
index f110fe3f6..f110fe3f6 100644
--- a/toolkit/components/jetpack/sdk/remote/parent.js
+++ b/components/jetpack/sdk/remote/parent.js
diff --git a/toolkit/components/jetpack/sdk/remote/utils.js b/components/jetpack/sdk/remote/utils.js
index 5a5e39198..5a5e39198 100644
--- a/toolkit/components/jetpack/sdk/remote/utils.js
+++ b/components/jetpack/sdk/remote/utils.js
diff --git a/toolkit/components/jetpack/sdk/request.js b/components/jetpack/sdk/request.js
index 96bb1e6d7..96bb1e6d7 100644
--- a/toolkit/components/jetpack/sdk/request.js
+++ b/components/jetpack/sdk/request.js
diff --git a/toolkit/components/jetpack/sdk/selection.js b/components/jetpack/sdk/selection.js
index e393aae06..e393aae06 100644
--- a/toolkit/components/jetpack/sdk/selection.js
+++ b/components/jetpack/sdk/selection.js
diff --git a/toolkit/components/jetpack/sdk/self.js b/components/jetpack/sdk/self.js
index c2114a926..c2114a926 100644
--- a/toolkit/components/jetpack/sdk/self.js
+++ b/components/jetpack/sdk/self.js
diff --git a/toolkit/components/jetpack/sdk/simple-prefs.js b/components/jetpack/sdk/simple-prefs.js
index 3472f4418..3472f4418 100644
--- a/toolkit/components/jetpack/sdk/simple-prefs.js
+++ b/components/jetpack/sdk/simple-prefs.js
diff --git a/toolkit/components/jetpack/sdk/simple-storage.js b/components/jetpack/sdk/simple-storage.js
index bcf9b1cb9..bcf9b1cb9 100644
--- a/toolkit/components/jetpack/sdk/simple-storage.js
+++ b/components/jetpack/sdk/simple-storage.js
diff --git a/toolkit/components/jetpack/sdk/stylesheet/style.js b/components/jetpack/sdk/stylesheet/style.js
index 7ec0787e1..7ec0787e1 100644
--- a/toolkit/components/jetpack/sdk/stylesheet/style.js
+++ b/components/jetpack/sdk/stylesheet/style.js
diff --git a/toolkit/components/jetpack/sdk/stylesheet/utils.js b/components/jetpack/sdk/stylesheet/utils.js
index 844996bf3..844996bf3 100644
--- a/toolkit/components/jetpack/sdk/stylesheet/utils.js
+++ b/components/jetpack/sdk/stylesheet/utils.js
diff --git a/toolkit/components/jetpack/sdk/system.js b/components/jetpack/sdk/system.js
index 1acfe8c8c..1acfe8c8c 100644
--- a/toolkit/components/jetpack/sdk/system.js
+++ b/components/jetpack/sdk/system.js
diff --git a/toolkit/components/jetpack/sdk/system/child_process.js b/components/jetpack/sdk/system/child_process.js
index 8ea1f4f80..8ea1f4f80 100644
--- a/toolkit/components/jetpack/sdk/system/child_process.js
+++ b/components/jetpack/sdk/system/child_process.js
diff --git a/toolkit/components/jetpack/sdk/system/child_process/subprocess.js b/components/jetpack/sdk/system/child_process/subprocess.js
index e3454e95b..e3454e95b 100644
--- a/toolkit/components/jetpack/sdk/system/child_process/subprocess.js
+++ b/components/jetpack/sdk/system/child_process/subprocess.js
diff --git a/toolkit/components/jetpack/sdk/system/environment.js b/components/jetpack/sdk/system/environment.js
index 13621a696..13621a696 100644
--- a/toolkit/components/jetpack/sdk/system/environment.js
+++ b/components/jetpack/sdk/system/environment.js
diff --git a/toolkit/components/jetpack/sdk/system/events-shimmed.js b/components/jetpack/sdk/system/events-shimmed.js
index 14496f1f0..14496f1f0 100644
--- a/toolkit/components/jetpack/sdk/system/events-shimmed.js
+++ b/components/jetpack/sdk/system/events-shimmed.js
diff --git a/toolkit/components/jetpack/sdk/system/events.js b/components/jetpack/sdk/system/events.js
index 0cf525aa1..0cf525aa1 100644
--- a/toolkit/components/jetpack/sdk/system/events.js
+++ b/components/jetpack/sdk/system/events.js
diff --git a/toolkit/components/jetpack/sdk/system/globals.js b/components/jetpack/sdk/system/globals.js
index a1a6cf9a2..a1a6cf9a2 100644
--- a/toolkit/components/jetpack/sdk/system/globals.js
+++ b/components/jetpack/sdk/system/globals.js
diff --git a/toolkit/components/jetpack/sdk/system/process.js b/components/jetpack/sdk/system/process.js
index f44a36658..f44a36658 100644
--- a/toolkit/components/jetpack/sdk/system/process.js
+++ b/components/jetpack/sdk/system/process.js
diff --git a/toolkit/components/jetpack/sdk/system/runtime.js b/components/jetpack/sdk/system/runtime.js
index 9a70f142d..9a70f142d 100644
--- a/toolkit/components/jetpack/sdk/system/runtime.js
+++ b/components/jetpack/sdk/system/runtime.js
diff --git a/toolkit/components/jetpack/sdk/system/unload.js b/components/jetpack/sdk/system/unload.js
index 98ab5f8f3..98ab5f8f3 100644
--- a/toolkit/components/jetpack/sdk/system/unload.js
+++ b/components/jetpack/sdk/system/unload.js
diff --git a/toolkit/components/jetpack/sdk/system/xul-app.js b/components/jetpack/sdk/system/xul-app.js
index 612386f77..612386f77 100644
--- a/toolkit/components/jetpack/sdk/system/xul-app.js
+++ b/components/jetpack/sdk/system/xul-app.js
diff --git a/toolkit/components/jetpack/sdk/system/xul-app.jsm b/components/jetpack/sdk/system/xul-app.jsm
index ed760c3a4..ed760c3a4 100644
--- a/toolkit/components/jetpack/sdk/system/xul-app.jsm
+++ b/components/jetpack/sdk/system/xul-app.jsm
diff --git a/toolkit/components/jetpack/sdk/tab/events.js b/components/jetpack/sdk/tab/events.js
index e431cc9d2..e431cc9d2 100644
--- a/toolkit/components/jetpack/sdk/tab/events.js
+++ b/components/jetpack/sdk/tab/events.js
diff --git a/toolkit/components/jetpack/sdk/tabs.js b/components/jetpack/sdk/tabs.js
index f61cad478..f61cad478 100644
--- a/toolkit/components/jetpack/sdk/tabs.js
+++ b/components/jetpack/sdk/tabs.js
diff --git a/toolkit/components/jetpack/sdk/tabs/common.js b/components/jetpack/sdk/tabs/common.js
index 9ee512a7b..9ee512a7b 100644
--- a/toolkit/components/jetpack/sdk/tabs/common.js
+++ b/components/jetpack/sdk/tabs/common.js
diff --git a/toolkit/components/jetpack/sdk/tabs/events.js b/components/jetpack/sdk/tabs/events.js
index 65650f9dc..65650f9dc 100644
--- a/toolkit/components/jetpack/sdk/tabs/events.js
+++ b/components/jetpack/sdk/tabs/events.js
diff --git a/toolkit/components/jetpack/sdk/tabs/helpers.js b/components/jetpack/sdk/tabs/helpers.js
index b2c8aa013..b2c8aa013 100644
--- a/toolkit/components/jetpack/sdk/tabs/helpers.js
+++ b/components/jetpack/sdk/tabs/helpers.js
diff --git a/toolkit/components/jetpack/sdk/tabs/namespace.js b/components/jetpack/sdk/tabs/namespace.js
index 3553b1a99..3553b1a99 100644
--- a/toolkit/components/jetpack/sdk/tabs/namespace.js
+++ b/components/jetpack/sdk/tabs/namespace.js
diff --git a/toolkit/components/jetpack/sdk/tabs/observer.js b/components/jetpack/sdk/tabs/observer.js
index 4e935cd62..4e935cd62 100644
--- a/toolkit/components/jetpack/sdk/tabs/observer.js
+++ b/components/jetpack/sdk/tabs/observer.js
diff --git a/toolkit/components/jetpack/sdk/tabs/tab-fennec.js b/components/jetpack/sdk/tabs/tab-fennec.js
index 3927337f6..3927337f6 100644
--- a/toolkit/components/jetpack/sdk/tabs/tab-fennec.js
+++ b/components/jetpack/sdk/tabs/tab-fennec.js
diff --git a/toolkit/components/jetpack/sdk/tabs/tab-firefox.js b/components/jetpack/sdk/tabs/tab-firefox.js
index f1da92379..f1da92379 100644
--- a/toolkit/components/jetpack/sdk/tabs/tab-firefox.js
+++ b/components/jetpack/sdk/tabs/tab-firefox.js
diff --git a/toolkit/components/jetpack/sdk/tabs/tab.js b/components/jetpack/sdk/tabs/tab.js
index fa2272494..fa2272494 100644
--- a/toolkit/components/jetpack/sdk/tabs/tab.js
+++ b/components/jetpack/sdk/tabs/tab.js
diff --git a/toolkit/components/jetpack/sdk/tabs/tabs-firefox.js b/components/jetpack/sdk/tabs/tabs-firefox.js
index 1eefecb4c..1eefecb4c 100644
--- a/toolkit/components/jetpack/sdk/tabs/tabs-firefox.js
+++ b/components/jetpack/sdk/tabs/tabs-firefox.js
diff --git a/toolkit/components/jetpack/sdk/tabs/utils.js b/components/jetpack/sdk/tabs/utils.js
index eae3d41fe..eae3d41fe 100644
--- a/toolkit/components/jetpack/sdk/tabs/utils.js
+++ b/components/jetpack/sdk/tabs/utils.js
diff --git a/toolkit/components/jetpack/sdk/tabs/worker.js b/components/jetpack/sdk/tabs/worker.js
index d2ba33696..d2ba33696 100644
--- a/toolkit/components/jetpack/sdk/tabs/worker.js
+++ b/components/jetpack/sdk/tabs/worker.js
diff --git a/toolkit/components/jetpack/sdk/test.js b/components/jetpack/sdk/test.js
index e7e3df840..e7e3df840 100644
--- a/toolkit/components/jetpack/sdk/test.js
+++ b/components/jetpack/sdk/test.js
diff --git a/toolkit/components/jetpack/sdk/test/assert.js b/components/jetpack/sdk/test/assert.js
index 8478c8414..8478c8414 100644
--- a/toolkit/components/jetpack/sdk/test/assert.js
+++ b/components/jetpack/sdk/test/assert.js
diff --git a/toolkit/components/jetpack/sdk/test/harness.js b/components/jetpack/sdk/test/harness.js
index 1b31a1c79..1b31a1c79 100644
--- a/toolkit/components/jetpack/sdk/test/harness.js
+++ b/components/jetpack/sdk/test/harness.js
diff --git a/toolkit/components/jetpack/sdk/test/httpd.js b/components/jetpack/sdk/test/httpd.js
index 218493924..218493924 100644
--- a/toolkit/components/jetpack/sdk/test/httpd.js
+++ b/components/jetpack/sdk/test/httpd.js
diff --git a/toolkit/components/jetpack/sdk/test/loader.js b/components/jetpack/sdk/test/loader.js
index 33ba2ca5a..33ba2ca5a 100644
--- a/toolkit/components/jetpack/sdk/test/loader.js
+++ b/components/jetpack/sdk/test/loader.js
diff --git a/toolkit/components/jetpack/sdk/test/memory.js b/components/jetpack/sdk/test/memory.js
index bd1198bfe..bd1198bfe 100644
--- a/toolkit/components/jetpack/sdk/test/memory.js
+++ b/components/jetpack/sdk/test/memory.js
diff --git a/toolkit/components/jetpack/sdk/test/options.js b/components/jetpack/sdk/test/options.js
index 9bc611ca5..9bc611ca5 100644
--- a/toolkit/components/jetpack/sdk/test/options.js
+++ b/components/jetpack/sdk/test/options.js
diff --git a/toolkit/components/jetpack/sdk/test/runner.js b/components/jetpack/sdk/test/runner.js
index ea37ac84f..ea37ac84f 100644
--- a/toolkit/components/jetpack/sdk/test/runner.js
+++ b/components/jetpack/sdk/test/runner.js
diff --git a/toolkit/components/jetpack/sdk/test/utils.js b/components/jetpack/sdk/test/utils.js
index b01df67d4..b01df67d4 100644
--- a/toolkit/components/jetpack/sdk/test/utils.js
+++ b/components/jetpack/sdk/test/utils.js
diff --git a/toolkit/components/jetpack/sdk/timers.js b/components/jetpack/sdk/timers.js
index e97db01f2..e97db01f2 100644
--- a/toolkit/components/jetpack/sdk/timers.js
+++ b/components/jetpack/sdk/timers.js
diff --git a/toolkit/components/jetpack/sdk/ui.js b/components/jetpack/sdk/ui.js
index d1ff7ceb8..d1ff7ceb8 100644
--- a/toolkit/components/jetpack/sdk/ui.js
+++ b/components/jetpack/sdk/ui.js
diff --git a/toolkit/components/jetpack/sdk/ui/button/action.js b/components/jetpack/sdk/ui/button/action.js
index 5355705be..5355705be 100644
--- a/toolkit/components/jetpack/sdk/ui/button/action.js
+++ b/components/jetpack/sdk/ui/button/action.js
diff --git a/toolkit/components/jetpack/sdk/ui/button/contract.js b/components/jetpack/sdk/ui/button/contract.js
index ce6e33d95..ce6e33d95 100644
--- a/toolkit/components/jetpack/sdk/ui/button/contract.js
+++ b/components/jetpack/sdk/ui/button/contract.js
diff --git a/toolkit/components/jetpack/sdk/ui/button/toggle.js b/components/jetpack/sdk/ui/button/toggle.js
index d8a3d1758..d8a3d1758 100644
--- a/toolkit/components/jetpack/sdk/ui/button/toggle.js
+++ b/components/jetpack/sdk/ui/button/toggle.js
diff --git a/toolkit/components/jetpack/sdk/ui/button/view.js b/components/jetpack/sdk/ui/button/view.js
index dcc3be59d..dcc3be59d 100644
--- a/toolkit/components/jetpack/sdk/ui/button/view.js
+++ b/components/jetpack/sdk/ui/button/view.js
diff --git a/toolkit/components/jetpack/sdk/ui/button/view/events.js b/components/jetpack/sdk/ui/button/view/events.js
index 34d14be3a..34d14be3a 100644
--- a/toolkit/components/jetpack/sdk/ui/button/view/events.js
+++ b/components/jetpack/sdk/ui/button/view/events.js
diff --git a/toolkit/components/jetpack/sdk/ui/buttons.js b/components/jetpack/sdk/ui/buttons.js
index 450584ea7..450584ea7 100644
--- a/toolkit/components/jetpack/sdk/ui/buttons.js
+++ b/components/jetpack/sdk/ui/buttons.js
diff --git a/toolkit/components/jetpack/sdk/ui/component.js b/components/jetpack/sdk/ui/component.js
index d1f12c95e..d1f12c95e 100644
--- a/toolkit/components/jetpack/sdk/ui/component.js
+++ b/components/jetpack/sdk/ui/component.js
diff --git a/toolkit/components/jetpack/sdk/ui/frame.js b/components/jetpack/sdk/ui/frame.js
index 566353cdf..566353cdf 100644
--- a/toolkit/components/jetpack/sdk/ui/frame.js
+++ b/components/jetpack/sdk/ui/frame.js
diff --git a/toolkit/components/jetpack/sdk/ui/frame/model.js b/components/jetpack/sdk/ui/frame/model.js
index 627310874..627310874 100644
--- a/toolkit/components/jetpack/sdk/ui/frame/model.js
+++ b/components/jetpack/sdk/ui/frame/model.js
diff --git a/toolkit/components/jetpack/sdk/ui/frame/view.html b/components/jetpack/sdk/ui/frame/view.html
index 2a405b583..2a405b583 100644
--- a/toolkit/components/jetpack/sdk/ui/frame/view.html
+++ b/components/jetpack/sdk/ui/frame/view.html
diff --git a/toolkit/components/jetpack/sdk/ui/frame/view.js b/components/jetpack/sdk/ui/frame/view.js
index 2eb4df2b7..2eb4df2b7 100644
--- a/toolkit/components/jetpack/sdk/ui/frame/view.js
+++ b/components/jetpack/sdk/ui/frame/view.js
diff --git a/toolkit/components/jetpack/sdk/ui/id.js b/components/jetpack/sdk/ui/id.js
index d17eb0a4e..d17eb0a4e 100644
--- a/toolkit/components/jetpack/sdk/ui/id.js
+++ b/components/jetpack/sdk/ui/id.js
diff --git a/toolkit/components/jetpack/sdk/ui/sidebar.js b/components/jetpack/sdk/ui/sidebar.js
index 59e35ea11..59e35ea11 100644
--- a/toolkit/components/jetpack/sdk/ui/sidebar.js
+++ b/components/jetpack/sdk/ui/sidebar.js
diff --git a/toolkit/components/jetpack/sdk/ui/sidebar/actions.js b/components/jetpack/sdk/ui/sidebar/actions.js
index 4a52984c9..4a52984c9 100644
--- a/toolkit/components/jetpack/sdk/ui/sidebar/actions.js
+++ b/components/jetpack/sdk/ui/sidebar/actions.js
diff --git a/toolkit/components/jetpack/sdk/ui/sidebar/contract.js b/components/jetpack/sdk/ui/sidebar/contract.js
index b59c37c0b..b59c37c0b 100644
--- a/toolkit/components/jetpack/sdk/ui/sidebar/contract.js
+++ b/components/jetpack/sdk/ui/sidebar/contract.js
diff --git a/toolkit/components/jetpack/sdk/ui/sidebar/namespace.js b/components/jetpack/sdk/ui/sidebar/namespace.js
index d79725d1a..d79725d1a 100644
--- a/toolkit/components/jetpack/sdk/ui/sidebar/namespace.js
+++ b/components/jetpack/sdk/ui/sidebar/namespace.js
diff --git a/toolkit/components/jetpack/sdk/ui/sidebar/utils.js b/components/jetpack/sdk/ui/sidebar/utils.js
index d6145c32e..d6145c32e 100644
--- a/toolkit/components/jetpack/sdk/ui/sidebar/utils.js
+++ b/components/jetpack/sdk/ui/sidebar/utils.js
diff --git a/toolkit/components/jetpack/sdk/ui/sidebar/view.js b/components/jetpack/sdk/ui/sidebar/view.js
index c91e69d3d..c91e69d3d 100644
--- a/toolkit/components/jetpack/sdk/ui/sidebar/view.js
+++ b/components/jetpack/sdk/ui/sidebar/view.js
diff --git a/toolkit/components/jetpack/sdk/ui/state.js b/components/jetpack/sdk/ui/state.js
index c90d4283d..c90d4283d 100644
--- a/toolkit/components/jetpack/sdk/ui/state.js
+++ b/components/jetpack/sdk/ui/state.js
diff --git a/toolkit/components/jetpack/sdk/ui/state/events.js b/components/jetpack/sdk/ui/state/events.js
index 34d14be3a..34d14be3a 100644
--- a/toolkit/components/jetpack/sdk/ui/state/events.js
+++ b/components/jetpack/sdk/ui/state/events.js
diff --git a/toolkit/components/jetpack/sdk/ui/toolbar.js b/components/jetpack/sdk/ui/toolbar.js
index c1becab2d..c1becab2d 100644
--- a/toolkit/components/jetpack/sdk/ui/toolbar.js
+++ b/components/jetpack/sdk/ui/toolbar.js
diff --git a/toolkit/components/jetpack/sdk/ui/toolbar/model.js b/components/jetpack/sdk/ui/toolbar/model.js
index 5c5428606..5c5428606 100644
--- a/toolkit/components/jetpack/sdk/ui/toolbar/model.js
+++ b/components/jetpack/sdk/ui/toolbar/model.js
diff --git a/toolkit/components/jetpack/sdk/ui/toolbar/view.js b/components/jetpack/sdk/ui/toolbar/view.js
index 4ef0c3d46..4ef0c3d46 100644
--- a/toolkit/components/jetpack/sdk/ui/toolbar/view.js
+++ b/components/jetpack/sdk/ui/toolbar/view.js
diff --git a/toolkit/components/jetpack/sdk/uri/resource.js b/components/jetpack/sdk/uri/resource.js
index 8a1dcbf2c..8a1dcbf2c 100644
--- a/toolkit/components/jetpack/sdk/uri/resource.js
+++ b/components/jetpack/sdk/uri/resource.js
diff --git a/toolkit/components/jetpack/sdk/url.js b/components/jetpack/sdk/url.js
index ae16ac4a8..ae16ac4a8 100644
--- a/toolkit/components/jetpack/sdk/url.js
+++ b/components/jetpack/sdk/url.js
diff --git a/toolkit/components/jetpack/sdk/url/utils.js b/components/jetpack/sdk/url/utils.js
index aa5759204..aa5759204 100644
--- a/toolkit/components/jetpack/sdk/url/utils.js
+++ b/components/jetpack/sdk/url/utils.js
diff --git a/toolkit/components/jetpack/sdk/util/array.js b/components/jetpack/sdk/util/array.js
index 1d61a973e..1d61a973e 100644
--- a/toolkit/components/jetpack/sdk/util/array.js
+++ b/components/jetpack/sdk/util/array.js
diff --git a/toolkit/components/jetpack/sdk/util/collection.js b/components/jetpack/sdk/util/collection.js
index 194a29470..194a29470 100644
--- a/toolkit/components/jetpack/sdk/util/collection.js
+++ b/components/jetpack/sdk/util/collection.js
diff --git a/toolkit/components/jetpack/sdk/util/contract.js b/components/jetpack/sdk/util/contract.js
index c689ea601..c689ea601 100644
--- a/toolkit/components/jetpack/sdk/util/contract.js
+++ b/components/jetpack/sdk/util/contract.js
diff --git a/toolkit/components/jetpack/sdk/util/deprecate.js b/components/jetpack/sdk/util/deprecate.js
index 40f236de5..40f236de5 100644
--- a/toolkit/components/jetpack/sdk/util/deprecate.js
+++ b/components/jetpack/sdk/util/deprecate.js
diff --git a/toolkit/components/jetpack/sdk/util/dispatcher.js b/components/jetpack/sdk/util/dispatcher.js
index 67d29dfed..67d29dfed 100644
--- a/toolkit/components/jetpack/sdk/util/dispatcher.js
+++ b/components/jetpack/sdk/util/dispatcher.js
diff --git a/toolkit/components/jetpack/sdk/util/list.js b/components/jetpack/sdk/util/list.js
index 6d7d2dea9..6d7d2dea9 100644
--- a/toolkit/components/jetpack/sdk/util/list.js
+++ b/components/jetpack/sdk/util/list.js
diff --git a/toolkit/components/jetpack/sdk/util/match-pattern.js b/components/jetpack/sdk/util/match-pattern.js
index a0eb88b49..a0eb88b49 100644
--- a/toolkit/components/jetpack/sdk/util/match-pattern.js
+++ b/components/jetpack/sdk/util/match-pattern.js
diff --git a/toolkit/components/jetpack/sdk/util/object.js b/components/jetpack/sdk/util/object.js
index 9d202bb51..9d202bb51 100644
--- a/toolkit/components/jetpack/sdk/util/object.js
+++ b/components/jetpack/sdk/util/object.js
diff --git a/toolkit/components/jetpack/sdk/util/rules.js b/components/jetpack/sdk/util/rules.js
index 98e3109b0..98e3109b0 100644
--- a/toolkit/components/jetpack/sdk/util/rules.js
+++ b/components/jetpack/sdk/util/rules.js
diff --git a/toolkit/components/jetpack/sdk/util/sequence.js b/components/jetpack/sdk/util/sequence.js
index 28e3de255..28e3de255 100644
--- a/toolkit/components/jetpack/sdk/util/sequence.js
+++ b/components/jetpack/sdk/util/sequence.js
diff --git a/toolkit/components/jetpack/sdk/util/uuid.js b/components/jetpack/sdk/util/uuid.js
index 6d0f2de53..6d0f2de53 100644
--- a/toolkit/components/jetpack/sdk/util/uuid.js
+++ b/components/jetpack/sdk/util/uuid.js
diff --git a/toolkit/components/jetpack/sdk/view/core.js b/components/jetpack/sdk/view/core.js
index 5e82e9b5d..5e82e9b5d 100644
--- a/toolkit/components/jetpack/sdk/view/core.js
+++ b/components/jetpack/sdk/view/core.js
diff --git a/toolkit/components/jetpack/sdk/window/browser.js b/components/jetpack/sdk/window/browser.js
index 380b5a486..380b5a486 100644
--- a/toolkit/components/jetpack/sdk/window/browser.js
+++ b/components/jetpack/sdk/window/browser.js
diff --git a/toolkit/components/jetpack/sdk/window/events.js b/components/jetpack/sdk/window/events.js
index b1d3a1f3e..b1d3a1f3e 100644
--- a/toolkit/components/jetpack/sdk/window/events.js
+++ b/components/jetpack/sdk/window/events.js
diff --git a/toolkit/components/jetpack/sdk/window/helpers.js b/components/jetpack/sdk/window/helpers.js
index 56cfcaba7..56cfcaba7 100644
--- a/toolkit/components/jetpack/sdk/window/helpers.js
+++ b/components/jetpack/sdk/window/helpers.js
diff --git a/toolkit/components/jetpack/sdk/window/namespace.js b/components/jetpack/sdk/window/namespace.js
index b486f888d..b486f888d 100644
--- a/toolkit/components/jetpack/sdk/window/namespace.js
+++ b/components/jetpack/sdk/window/namespace.js
diff --git a/toolkit/components/jetpack/sdk/window/utils.js b/components/jetpack/sdk/window/utils.js
index db91a0fed..db91a0fed 100644
--- a/toolkit/components/jetpack/sdk/window/utils.js
+++ b/components/jetpack/sdk/window/utils.js
diff --git a/toolkit/components/jetpack/sdk/windows.js b/components/jetpack/sdk/windows.js
index 06dbe70b2..06dbe70b2 100644
--- a/toolkit/components/jetpack/sdk/windows.js
+++ b/components/jetpack/sdk/windows.js
diff --git a/toolkit/components/jetpack/sdk/windows/fennec.js b/components/jetpack/sdk/windows/fennec.js
index 3c3b6c313..3c3b6c313 100644
--- a/toolkit/components/jetpack/sdk/windows/fennec.js
+++ b/components/jetpack/sdk/windows/fennec.js
diff --git a/toolkit/components/jetpack/sdk/windows/firefox.js b/components/jetpack/sdk/windows/firefox.js
index 1eb1d8488..1eb1d8488 100644
--- a/toolkit/components/jetpack/sdk/windows/firefox.js
+++ b/components/jetpack/sdk/windows/firefox.js
diff --git a/toolkit/components/jetpack/sdk/windows/observer.js b/components/jetpack/sdk/windows/observer.js
index 5ba2535f1..5ba2535f1 100644
--- a/toolkit/components/jetpack/sdk/windows/observer.js
+++ b/components/jetpack/sdk/windows/observer.js
diff --git a/toolkit/components/jetpack/sdk/windows/tabs-fennec.js b/components/jetpack/sdk/windows/tabs-fennec.js
index 0ef5ec9f5..0ef5ec9f5 100644
--- a/toolkit/components/jetpack/sdk/windows/tabs-fennec.js
+++ b/components/jetpack/sdk/windows/tabs-fennec.js
diff --git a/toolkit/components/jetpack/sdk/worker/utils.js b/components/jetpack/sdk/worker/utils.js
index fca19be63..fca19be63 100644
--- a/toolkit/components/jetpack/sdk/worker/utils.js
+++ b/components/jetpack/sdk/worker/utils.js
diff --git a/toolkit/components/jetpack/sdk/zip/utils.js b/components/jetpack/sdk/zip/utils.js
index e600380cb..e600380cb 100644
--- a/toolkit/components/jetpack/sdk/zip/utils.js
+++ b/components/jetpack/sdk/zip/utils.js
diff --git a/toolkit/components/jetpack/test.js b/components/jetpack/test.js
index f0219f0a4..f0219f0a4 100644
--- a/toolkit/components/jetpack/test.js
+++ b/components/jetpack/test.js
diff --git a/toolkit/components/jetpack/toolkit/loader.js b/components/jetpack/toolkit/loader.js
index 4c22550d8..4c22550d8 100644
--- a/toolkit/components/jetpack/toolkit/loader.js
+++ b/components/jetpack/toolkit/loader.js
diff --git a/toolkit/components/jetpack/toolkit/require.js b/components/jetpack/toolkit/require.js
index dc3d26ab2..dc3d26ab2 100644
--- a/toolkit/components/jetpack/toolkit/require.js
+++ b/components/jetpack/toolkit/require.js
diff --git a/toolkit/components/jsdownloads/moz.build b/components/jsdownloads/moz.build
index 82a240e0b..82a240e0b 100644
--- a/toolkit/components/jsdownloads/moz.build
+++ b/components/jsdownloads/moz.build
diff --git a/toolkit/components/jsdownloads/public/moz.build b/components/jsdownloads/public/moz.build
index 6ea66bf5f..6ea66bf5f 100644
--- a/toolkit/components/jsdownloads/public/moz.build
+++ b/components/jsdownloads/public/moz.build
diff --git a/toolkit/components/jsdownloads/public/mozIDownloadPlatform.idl b/components/jsdownloads/public/mozIDownloadPlatform.idl
index ca7b8a165..ca7b8a165 100644
--- a/toolkit/components/jsdownloads/public/mozIDownloadPlatform.idl
+++ b/components/jsdownloads/public/mozIDownloadPlatform.idl
diff --git a/toolkit/components/jsdownloads/src/DownloadCore.jsm b/components/jsdownloads/src/DownloadCore.jsm
index da1a740fb..da1a740fb 100644
--- a/toolkit/components/jsdownloads/src/DownloadCore.jsm
+++ b/components/jsdownloads/src/DownloadCore.jsm
diff --git a/toolkit/components/jsdownloads/src/DownloadImport.jsm b/components/jsdownloads/src/DownloadImport.jsm
index 063a93f4f..063a93f4f 100644
--- a/toolkit/components/jsdownloads/src/DownloadImport.jsm
+++ b/components/jsdownloads/src/DownloadImport.jsm
diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/components/jsdownloads/src/DownloadIntegration.jsm
index 8b5c64498..8b5c64498 100644
--- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+++ b/components/jsdownloads/src/DownloadIntegration.jsm
diff --git a/toolkit/components/jsdownloads/src/DownloadLegacy.js b/components/jsdownloads/src/DownloadLegacy.js
index 3b7e8a1eb..3b7e8a1eb 100644
--- a/toolkit/components/jsdownloads/src/DownloadLegacy.js
+++ b/components/jsdownloads/src/DownloadLegacy.js
diff --git a/toolkit/components/jsdownloads/src/DownloadList.jsm b/components/jsdownloads/src/DownloadList.jsm
index 89f0c101f..89f0c101f 100644
--- a/toolkit/components/jsdownloads/src/DownloadList.jsm
+++ b/components/jsdownloads/src/DownloadList.jsm
diff --git a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp b/components/jsdownloads/src/DownloadPlatform.cpp
index 14277e5bd..14277e5bd 100644
--- a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp
+++ b/components/jsdownloads/src/DownloadPlatform.cpp
diff --git a/toolkit/components/jsdownloads/src/DownloadPlatform.h b/components/jsdownloads/src/DownloadPlatform.h
index ef3c7554f..ef3c7554f 100644
--- a/toolkit/components/jsdownloads/src/DownloadPlatform.h
+++ b/components/jsdownloads/src/DownloadPlatform.h
diff --git a/toolkit/components/jsdownloads/src/DownloadStore.jsm b/components/jsdownloads/src/DownloadStore.jsm
index c96681cc6..c96681cc6 100644
--- a/toolkit/components/jsdownloads/src/DownloadStore.jsm
+++ b/components/jsdownloads/src/DownloadStore.jsm
diff --git a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm b/components/jsdownloads/src/DownloadUIHelper.jsm
index 860a325d4..860a325d4 100644
--- a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
+++ b/components/jsdownloads/src/DownloadUIHelper.jsm
diff --git a/toolkit/components/jsdownloads/src/Downloads.jsm b/components/jsdownloads/src/Downloads.jsm
index 3f15ec003..3f15ec003 100644
--- a/toolkit/components/jsdownloads/src/Downloads.jsm
+++ b/components/jsdownloads/src/Downloads.jsm
diff --git a/toolkit/components/jsdownloads/src/Downloads.manifest b/components/jsdownloads/src/Downloads.manifest
index 03d4ed4a6..03d4ed4a6 100644
--- a/toolkit/components/jsdownloads/src/Downloads.manifest
+++ b/components/jsdownloads/src/Downloads.manifest
diff --git a/toolkit/components/jsdownloads/src/moz.build b/components/jsdownloads/src/moz.build
index 115435f64..115435f64 100644
--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/components/jsdownloads/src/moz.build
diff --git a/toolkit/components/lz4/lz4.cpp b/components/lz4/lz4.cpp
index 34d568025..34d568025 100644
--- a/toolkit/components/lz4/lz4.cpp
+++ b/components/lz4/lz4.cpp
diff --git a/toolkit/components/lz4/lz4.js b/components/lz4/lz4.js
index 8d4ffcf8e..8d4ffcf8e 100644
--- a/toolkit/components/lz4/lz4.js
+++ b/components/lz4/lz4.js
diff --git a/toolkit/components/lz4/lz4_internal.js b/components/lz4/lz4_internal.js
index d1227da6c..d1227da6c 100644
--- a/toolkit/components/lz4/lz4_internal.js
+++ b/components/lz4/lz4_internal.js
diff --git a/toolkit/components/lz4/moz.build b/components/lz4/moz.build
index 470f964d0..470f964d0 100644
--- a/toolkit/components/lz4/moz.build
+++ b/components/lz4/moz.build
diff --git a/toolkit/components/mediasniffer/moz.build b/components/mediasniffer/moz.build
index fcbb1af56..fcbb1af56 100644
--- a/toolkit/components/mediasniffer/moz.build
+++ b/components/mediasniffer/moz.build
diff --git a/toolkit/components/mediasniffer/mp3sniff.c b/components/mediasniffer/mp3sniff.c
index a515d9c58..a515d9c58 100644
--- a/toolkit/components/mediasniffer/mp3sniff.c
+++ b/components/mediasniffer/mp3sniff.c
diff --git a/toolkit/components/mediasniffer/mp3sniff.h b/components/mediasniffer/mp3sniff.h
index 5b041a0a2..5b041a0a2 100644
--- a/toolkit/components/mediasniffer/mp3sniff.h
+++ b/components/mediasniffer/mp3sniff.h
diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.cpp b/components/mediasniffer/nsMediaSniffer.cpp
index 29ba311e6..29ba311e6 100644
--- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp
+++ b/components/mediasniffer/nsMediaSniffer.cpp
diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.h b/components/mediasniffer/nsMediaSniffer.h
index 45f6ac854..45f6ac854 100644
--- a/toolkit/components/mediasniffer/nsMediaSniffer.h
+++ b/components/mediasniffer/nsMediaSniffer.h
diff --git a/toolkit/components/mediasniffer/nsMediaSnifferModule.cpp b/components/mediasniffer/nsMediaSnifferModule.cpp
index f95e61084..f95e61084 100644
--- a/toolkit/components/mediasniffer/nsMediaSnifferModule.cpp
+++ b/components/mediasniffer/nsMediaSnifferModule.cpp
diff --git a/toolkit/components/microformats/microformat-shiv.js b/components/microformats/microformat-shiv.js
index b81e10796..b81e10796 100644
--- a/toolkit/components/microformats/microformat-shiv.js
+++ b/components/microformats/microformat-shiv.js
diff --git a/toolkit/components/microformats/moz.build b/components/microformats/moz.build
index eadb6fe66..eadb6fe66 100644
--- a/toolkit/components/microformats/moz.build
+++ b/components/microformats/moz.build
diff --git a/toolkit/components/microformats/update/package.json b/components/microformats/update/package.json
index 371986694..371986694 100644
--- a/toolkit/components/microformats/update/package.json
+++ b/components/microformats/update/package.json
diff --git a/toolkit/components/microformats/update/readme.txt b/components/microformats/update/readme.txt
index 0e41447a8..0e41447a8 100644
--- a/toolkit/components/microformats/update/readme.txt
+++ b/components/microformats/update/readme.txt
diff --git a/toolkit/components/microformats/update/update.js b/components/microformats/update/update.js
index 80795d523..80795d523 100644
--- a/toolkit/components/microformats/update/update.js
+++ b/components/microformats/update/update.js
diff --git a/toolkit/components/moz.build b/components/moz.build
index 23d2e75db..23d2e75db 100644
--- a/toolkit/components/moz.build
+++ b/components/moz.build
diff --git a/toolkit/components/mozintl/MozIntl.cpp b/components/mozintl/MozIntl.cpp
index 9c61c73a6..9c61c73a6 100644
--- a/toolkit/components/mozintl/MozIntl.cpp
+++ b/components/mozintl/MozIntl.cpp
diff --git a/toolkit/components/mozintl/MozIntl.h b/components/mozintl/MozIntl.h
index 00c10ed19..00c10ed19 100644
--- a/toolkit/components/mozintl/MozIntl.h
+++ b/components/mozintl/MozIntl.h
diff --git a/toolkit/components/mozintl/moz.build b/components/mozintl/moz.build
index 53d3ad968..53d3ad968 100644
--- a/toolkit/components/mozintl/moz.build
+++ b/components/mozintl/moz.build
diff --git a/toolkit/components/mozintl/mozIMozIntl.idl b/components/mozintl/mozIMozIntl.idl
index f28824d47..f28824d47 100644
--- a/toolkit/components/mozintl/mozIMozIntl.idl
+++ b/components/mozintl/mozIMozIntl.idl
diff --git a/toolkit/components/mozprotocol/moz.build b/components/mozprotocol/moz.build
index b96a64ec2..b96a64ec2 100644
--- a/toolkit/components/mozprotocol/moz.build
+++ b/components/mozprotocol/moz.build
diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.js b/components/mozprotocol/mozProtocolHandler.js
index 97bfb737e..97bfb737e 100644
--- a/toolkit/components/mozprotocol/mozProtocolHandler.js
+++ b/components/mozprotocol/mozProtocolHandler.js
diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.manifest b/components/mozprotocol/mozProtocolHandler.manifest
index bbfdf780a..bbfdf780a 100644
--- a/toolkit/components/mozprotocol/mozProtocolHandler.manifest
+++ b/components/mozprotocol/mozProtocolHandler.manifest
diff --git a/toolkit/components/narrate/.eslintrc.js b/components/narrate/.eslintrc.js
index b2d443575..b2d443575 100644
--- a/toolkit/components/narrate/.eslintrc.js
+++ b/components/narrate/.eslintrc.js
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/components/narrate/NarrateControls.jsm
index 56b3deaf8..56b3deaf8 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/components/narrate/NarrateControls.jsm
diff --git a/toolkit/components/narrate/Narrator.jsm b/components/narrate/Narrator.jsm
index ac0b2e040..ac0b2e040 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/components/narrate/Narrator.jsm
diff --git a/toolkit/components/narrate/VoiceSelect.jsm b/components/narrate/VoiceSelect.jsm
index 861a21c97..861a21c97 100644
--- a/toolkit/components/narrate/VoiceSelect.jsm
+++ b/components/narrate/VoiceSelect.jsm
diff --git a/toolkit/components/narrate/moz.build b/components/narrate/moz.build
index fe1dfb6ca..fe1dfb6ca 100644
--- a/toolkit/components/narrate/moz.build
+++ b/components/narrate/moz.build
diff --git a/toolkit/components/nsDefaultCLH.js b/components/nsDefaultCLH.js
index affbf75ee..affbf75ee 100644
--- a/toolkit/components/nsDefaultCLH.js
+++ b/components/nsDefaultCLH.js
diff --git a/toolkit/components/nsDefaultCLH.manifest b/components/nsDefaultCLH.manifest
index 075c8c416..075c8c416 100644
--- a/toolkit/components/nsDefaultCLH.manifest
+++ b/components/nsDefaultCLH.manifest
diff --git a/toolkit/components/osfile/NativeOSFileInternals.cpp b/components/osfile/NativeOSFileInternals.cpp
index 801c8c37d..801c8c37d 100644
--- a/toolkit/components/osfile/NativeOSFileInternals.cpp
+++ b/components/osfile/NativeOSFileInternals.cpp
diff --git a/toolkit/components/osfile/NativeOSFileInternals.h b/components/osfile/NativeOSFileInternals.h
index 2da929357..2da929357 100644
--- a/toolkit/components/osfile/NativeOSFileInternals.h
+++ b/components/osfile/NativeOSFileInternals.h
diff --git a/toolkit/components/osfile/modules/moz.build b/components/osfile/modules/moz.build
index 27f3c97cb..27f3c97cb 100644
--- a/toolkit/components/osfile/modules/moz.build
+++ b/components/osfile/modules/moz.build
diff --git a/toolkit/components/osfile/modules/osfile_async_front.jsm b/components/osfile/modules/osfile_async_front.jsm
index 826266ce5..826266ce5 100644
--- a/toolkit/components/osfile/modules/osfile_async_front.jsm
+++ b/components/osfile/modules/osfile_async_front.jsm
diff --git a/toolkit/components/osfile/modules/osfile_async_worker.js b/components/osfile/modules/osfile_async_worker.js
index 3ae99e705..3ae99e705 100644
--- a/toolkit/components/osfile/modules/osfile_async_worker.js
+++ b/components/osfile/modules/osfile_async_worker.js
diff --git a/toolkit/components/osfile/modules/osfile_native.jsm b/components/osfile/modules/osfile_native.jsm
index 16cd3c92a..16cd3c92a 100644
--- a/toolkit/components/osfile/modules/osfile_native.jsm
+++ b/components/osfile/modules/osfile_native.jsm
diff --git a/toolkit/components/osfile/modules/osfile_shared_allthreads.jsm b/components/osfile/modules/osfile_shared_allthreads.jsm
index c5c505102..c5c505102 100644
--- a/toolkit/components/osfile/modules/osfile_shared_allthreads.jsm
+++ b/components/osfile/modules/osfile_shared_allthreads.jsm
diff --git a/toolkit/components/osfile/modules/osfile_shared_front.jsm b/components/osfile/modules/osfile_shared_front.jsm
index a2971991d..a2971991d 100644
--- a/toolkit/components/osfile/modules/osfile_shared_front.jsm
+++ b/components/osfile/modules/osfile_shared_front.jsm
diff --git a/toolkit/components/osfile/modules/osfile_unix_allthreads.jsm b/components/osfile/modules/osfile_unix_allthreads.jsm
index 632f9c40b..632f9c40b 100644
--- a/toolkit/components/osfile/modules/osfile_unix_allthreads.jsm
+++ b/components/osfile/modules/osfile_unix_allthreads.jsm
diff --git a/toolkit/components/osfile/modules/osfile_unix_back.jsm b/components/osfile/modules/osfile_unix_back.jsm
index 4cc444567..4cc444567 100644
--- a/toolkit/components/osfile/modules/osfile_unix_back.jsm
+++ b/components/osfile/modules/osfile_unix_back.jsm
diff --git a/toolkit/components/osfile/modules/osfile_unix_front.jsm b/components/osfile/modules/osfile_unix_front.jsm
index 4e41036df..4e41036df 100644
--- a/toolkit/components/osfile/modules/osfile_unix_front.jsm
+++ b/components/osfile/modules/osfile_unix_front.jsm
diff --git a/toolkit/components/osfile/modules/osfile_win_allthreads.jsm b/components/osfile/modules/osfile_win_allthreads.jsm
index b059d4e12..b059d4e12 100644
--- a/toolkit/components/osfile/modules/osfile_win_allthreads.jsm
+++ b/components/osfile/modules/osfile_win_allthreads.jsm
diff --git a/toolkit/components/osfile/modules/osfile_win_back.jsm b/components/osfile/modules/osfile_win_back.jsm
index 21172b6bf..21172b6bf 100644
--- a/toolkit/components/osfile/modules/osfile_win_back.jsm
+++ b/components/osfile/modules/osfile_win_back.jsm
diff --git a/toolkit/components/osfile/modules/osfile_win_front.jsm b/components/osfile/modules/osfile_win_front.jsm
index 1123b251c..1123b251c 100644
--- a/toolkit/components/osfile/modules/osfile_win_front.jsm
+++ b/components/osfile/modules/osfile_win_front.jsm
diff --git a/toolkit/components/osfile/modules/ospath.jsm b/components/osfile/modules/ospath.jsm
index 68bbe4345..68bbe4345 100644
--- a/toolkit/components/osfile/modules/ospath.jsm
+++ b/components/osfile/modules/ospath.jsm
diff --git a/toolkit/components/osfile/modules/ospath_unix.jsm b/components/osfile/modules/ospath_unix.jsm
index 1d574baed..1d574baed 100644
--- a/toolkit/components/osfile/modules/ospath_unix.jsm
+++ b/components/osfile/modules/ospath_unix.jsm
diff --git a/toolkit/components/osfile/modules/ospath_win.jsm b/components/osfile/modules/ospath_win.jsm
index 31a87b115..31a87b115 100644
--- a/toolkit/components/osfile/modules/ospath_win.jsm
+++ b/components/osfile/modules/ospath_win.jsm
diff --git a/toolkit/components/osfile/moz.build b/components/osfile/moz.build
index e7c8cead1..e7c8cead1 100644
--- a/toolkit/components/osfile/moz.build
+++ b/components/osfile/moz.build
diff --git a/toolkit/components/osfile/nsINativeOSFileInternals.idl b/components/osfile/nsINativeOSFileInternals.idl
index 6e534bd43..6e534bd43 100644
--- a/toolkit/components/osfile/nsINativeOSFileInternals.idl
+++ b/components/osfile/nsINativeOSFileInternals.idl
diff --git a/toolkit/components/osfile/osfile.jsm b/components/osfile/osfile.jsm
index 20f21591a..20f21591a 100644
--- a/toolkit/components/osfile/osfile.jsm
+++ b/components/osfile/osfile.jsm
diff --git a/toolkit/components/parentalcontrols/moz.build b/components/parentalcontrols/moz.build
index 6c8bd9a8c..6c8bd9a8c 100644
--- a/toolkit/components/parentalcontrols/moz.build
+++ b/components/parentalcontrols/moz.build
diff --git a/toolkit/components/parentalcontrols/nsIParentalControlsService.idl b/components/parentalcontrols/nsIParentalControlsService.idl
index b9d49131f..b9d49131f 100644
--- a/toolkit/components/parentalcontrols/nsIParentalControlsService.idl
+++ b/components/parentalcontrols/nsIParentalControlsService.idl
diff --git a/toolkit/components/parentalcontrols/nsParentalControlsService.h b/components/parentalcontrols/nsParentalControlsService.h
index a0dc9c2db..a0dc9c2db 100644
--- a/toolkit/components/parentalcontrols/nsParentalControlsService.h
+++ b/components/parentalcontrols/nsParentalControlsService.h
diff --git a/toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp b/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
index 5d97b6f1b..5d97b6f1b 100644
--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
+++ b/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
diff --git a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp b/components/parentalcontrols/nsParentalControlsServiceWin.cpp
index e73bb097a..e73bb097a 100644
--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp
+++ b/components/parentalcontrols/nsParentalControlsServiceWin.cpp
diff --git a/toolkit/components/passwordmgr/.eslintrc.js b/components/passwordmgr/.eslintrc.js
index 188f7eeff..188f7eeff 100644
--- a/toolkit/components/passwordmgr/.eslintrc.js
+++ b/components/passwordmgr/.eslintrc.js
diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/components/passwordmgr/content/passwordManager.js
index f731cebb2..f731cebb2 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/components/passwordmgr/content/passwordManager.js
diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/components/passwordmgr/content/passwordManager.xul
index b512caf68..b512caf68 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/components/passwordmgr/content/passwordManager.xul
diff --git a/toolkit/components/passwordmgr/content/recipes.json b/components/passwordmgr/content/recipes.json
index fc747219b..fc747219b 100644
--- a/toolkit/components/passwordmgr/content/recipes.json
+++ b/components/passwordmgr/content/recipes.json
diff --git a/toolkit/components/passwordmgr/jar.mn b/components/passwordmgr/jar.mn
index db6d7ffef..db6d7ffef 100644
--- a/toolkit/components/passwordmgr/jar.mn
+++ b/components/passwordmgr/jar.mn
diff --git a/toolkit/components/passwordmgr/locale/passwordManager.dtd b/components/passwordmgr/locale/passwordManager.dtd
index 84e4ff69c..84e4ff69c 100644
--- a/toolkit/components/passwordmgr/locale/passwordManager.dtd
+++ b/components/passwordmgr/locale/passwordManager.dtd
diff --git a/toolkit/components/passwordmgr/locale/passwordmgr.properties b/components/passwordmgr/locale/passwordmgr.properties
index 6a399bbfc..6a399bbfc 100644
--- a/toolkit/components/passwordmgr/locale/passwordmgr.properties
+++ b/components/passwordmgr/locale/passwordmgr.properties
diff --git a/toolkit/components/passwordmgr/moz.build b/components/passwordmgr/moz.build
index d45753362..d45753362 100644
--- a/toolkit/components/passwordmgr/moz.build
+++ b/components/passwordmgr/moz.build
diff --git a/toolkit/components/passwordmgr/passwordmgr.manifest b/components/passwordmgr/passwordmgr.manifest
index c2c37ebff..c2c37ebff 100644
--- a/toolkit/components/passwordmgr/passwordmgr.manifest
+++ b/components/passwordmgr/passwordmgr.manifest
diff --git a/toolkit/components/passwordmgr/public/nsILoginInfo.idl b/components/passwordmgr/public/nsILoginInfo.idl
index 7dce9033d..7dce9033d 100644
--- a/toolkit/components/passwordmgr/public/nsILoginInfo.idl
+++ b/components/passwordmgr/public/nsILoginInfo.idl
diff --git a/toolkit/components/passwordmgr/public/nsILoginManager.idl b/components/passwordmgr/public/nsILoginManager.idl
index 30b5a0449..30b5a0449 100644
--- a/toolkit/components/passwordmgr/public/nsILoginManager.idl
+++ b/components/passwordmgr/public/nsILoginManager.idl
diff --git a/toolkit/components/passwordmgr/public/nsILoginManagerCrypto.idl b/components/passwordmgr/public/nsILoginManagerCrypto.idl
index 8af36a258..8af36a258 100644
--- a/toolkit/components/passwordmgr/public/nsILoginManagerCrypto.idl
+++ b/components/passwordmgr/public/nsILoginManagerCrypto.idl
diff --git a/toolkit/components/passwordmgr/public/nsILoginManagerPrompter.idl b/components/passwordmgr/public/nsILoginManagerPrompter.idl
index c673154d1..c673154d1 100644
--- a/toolkit/components/passwordmgr/public/nsILoginManagerPrompter.idl
+++ b/components/passwordmgr/public/nsILoginManagerPrompter.idl
diff --git a/toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl b/components/passwordmgr/public/nsILoginManagerStorage.idl
index 4ad3dbfe9..4ad3dbfe9 100644
--- a/toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl
+++ b/components/passwordmgr/public/nsILoginManagerStorage.idl
diff --git a/toolkit/components/passwordmgr/public/nsILoginMetaInfo.idl b/components/passwordmgr/public/nsILoginMetaInfo.idl
index 92d8f2bc8..92d8f2bc8 100644
--- a/toolkit/components/passwordmgr/public/nsILoginMetaInfo.idl
+++ b/components/passwordmgr/public/nsILoginMetaInfo.idl
diff --git a/toolkit/components/passwordmgr/src/InsecurePasswordUtils.jsm b/components/passwordmgr/src/InsecurePasswordUtils.jsm
index abd7c7fb4..abd7c7fb4 100644
--- a/toolkit/components/passwordmgr/src/InsecurePasswordUtils.jsm
+++ b/components/passwordmgr/src/InsecurePasswordUtils.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginHelper.jsm b/components/passwordmgr/src/LoginHelper.jsm
index c6cd40915..c6cd40915 100644
--- a/toolkit/components/passwordmgr/src/LoginHelper.jsm
+++ b/components/passwordmgr/src/LoginHelper.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginImport.jsm b/components/passwordmgr/src/LoginImport.jsm
index 05f0220ca..05f0220ca 100644
--- a/toolkit/components/passwordmgr/src/LoginImport.jsm
+++ b/components/passwordmgr/src/LoginImport.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginManagerContent.jsm b/components/passwordmgr/src/LoginManagerContent.jsm
index e8dcf8ad3..e8dcf8ad3 100644
--- a/toolkit/components/passwordmgr/src/LoginManagerContent.jsm
+++ b/components/passwordmgr/src/LoginManagerContent.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginManagerContextMenu.jsm b/components/passwordmgr/src/LoginManagerContextMenu.jsm
index 5c88687bf..5c88687bf 100644
--- a/toolkit/components/passwordmgr/src/LoginManagerContextMenu.jsm
+++ b/components/passwordmgr/src/LoginManagerContextMenu.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginManagerParent.jsm b/components/passwordmgr/src/LoginManagerParent.jsm
index 2d75dac7a..2d75dac7a 100644
--- a/toolkit/components/passwordmgr/src/LoginManagerParent.jsm
+++ b/components/passwordmgr/src/LoginManagerParent.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginRecipes.jsm b/components/passwordmgr/src/LoginRecipes.jsm
index 4a8124bbc..4a8124bbc 100644
--- a/toolkit/components/passwordmgr/src/LoginRecipes.jsm
+++ b/components/passwordmgr/src/LoginRecipes.jsm
diff --git a/toolkit/components/passwordmgr/src/LoginStore.jsm b/components/passwordmgr/src/LoginStore.jsm
index 9fa6e7dff..9fa6e7dff 100644
--- a/toolkit/components/passwordmgr/src/LoginStore.jsm
+++ b/components/passwordmgr/src/LoginStore.jsm
diff --git a/toolkit/components/passwordmgr/src/OSCrypto.jsm b/components/passwordmgr/src/OSCrypto.jsm
index 3d2b27c4e..3d2b27c4e 100644
--- a/toolkit/components/passwordmgr/src/OSCrypto.jsm
+++ b/components/passwordmgr/src/OSCrypto.jsm
diff --git a/toolkit/components/passwordmgr/src/OSCrypto_win.js b/components/passwordmgr/src/OSCrypto_win.js
index 0f52f4269..0f52f4269 100644
--- a/toolkit/components/passwordmgr/src/OSCrypto_win.js
+++ b/components/passwordmgr/src/OSCrypto_win.js
diff --git a/toolkit/components/passwordmgr/src/crypto-SDR.js b/components/passwordmgr/src/crypto-SDR.js
index b0916eb29..b0916eb29 100644
--- a/toolkit/components/passwordmgr/src/crypto-SDR.js
+++ b/components/passwordmgr/src/crypto-SDR.js
diff --git a/toolkit/components/passwordmgr/src/nsLoginInfo.js b/components/passwordmgr/src/nsLoginInfo.js
index d6ea86446..d6ea86446 100644
--- a/toolkit/components/passwordmgr/src/nsLoginInfo.js
+++ b/components/passwordmgr/src/nsLoginInfo.js
diff --git a/toolkit/components/passwordmgr/src/nsLoginManager.js b/components/passwordmgr/src/nsLoginManager.js
index 7d249ab9e..7d249ab9e 100644
--- a/toolkit/components/passwordmgr/src/nsLoginManager.js
+++ b/components/passwordmgr/src/nsLoginManager.js
diff --git a/toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js b/components/passwordmgr/src/nsLoginManagerPrompter.js
index 7adabf214..7adabf214 100644
--- a/toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js
+++ b/components/passwordmgr/src/nsLoginManagerPrompter.js
diff --git a/toolkit/components/passwordmgr/src/storage-json.js b/components/passwordmgr/src/storage-json.js
index 20834d45b..20834d45b 100644
--- a/toolkit/components/passwordmgr/src/storage-json.js
+++ b/components/passwordmgr/src/storage-json.js
diff --git a/toolkit/components/perf/.eslintrc.js b/components/perf/.eslintrc.js
index 4e6d4bcf0..4e6d4bcf0 100644
--- a/toolkit/components/perf/.eslintrc.js
+++ b/components/perf/.eslintrc.js
diff --git a/toolkit/components/perf/PerfMeasurement.cpp b/components/perf/PerfMeasurement.cpp
index 1b211b79c..1b211b79c 100644
--- a/toolkit/components/perf/PerfMeasurement.cpp
+++ b/components/perf/PerfMeasurement.cpp
diff --git a/toolkit/components/perf/PerfMeasurement.h b/components/perf/PerfMeasurement.h
index b158d1685..b158d1685 100644
--- a/toolkit/components/perf/PerfMeasurement.h
+++ b/components/perf/PerfMeasurement.h
diff --git a/toolkit/components/perf/PerfMeasurement.jsm b/components/perf/PerfMeasurement.jsm
index 29a221c6f..29a221c6f 100644
--- a/toolkit/components/perf/PerfMeasurement.jsm
+++ b/components/perf/PerfMeasurement.jsm
diff --git a/toolkit/components/perf/moz.build b/components/perf/moz.build
index 099a1c4eb..099a1c4eb 100644
--- a/toolkit/components/perf/moz.build
+++ b/components/perf/moz.build
diff --git a/toolkit/components/perfmonitoring/AddonWatcher.jsm b/components/perfmonitoring/AddonWatcher.jsm
index e5b95d1d8..e5b95d1d8 100644
--- a/toolkit/components/perfmonitoring/AddonWatcher.jsm
+++ b/components/perfmonitoring/AddonWatcher.jsm
diff --git a/toolkit/components/perfmonitoring/PerformanceStats-content.js b/components/perfmonitoring/PerformanceStats-content.js
index 9a6a2d81d..9a6a2d81d 100644
--- a/toolkit/components/perfmonitoring/PerformanceStats-content.js
+++ b/components/perfmonitoring/PerformanceStats-content.js
diff --git a/toolkit/components/perfmonitoring/PerformanceStats.jsm b/components/perfmonitoring/PerformanceStats.jsm
index 20f27a51b..20f27a51b 100644
--- a/toolkit/components/perfmonitoring/PerformanceStats.jsm
+++ b/components/perfmonitoring/PerformanceStats.jsm
diff --git a/toolkit/components/perfmonitoring/PerformanceWatcher-content.js b/components/perfmonitoring/PerformanceWatcher-content.js
index 2956cf5d0..2956cf5d0 100644
--- a/toolkit/components/perfmonitoring/PerformanceWatcher-content.js
+++ b/components/perfmonitoring/PerformanceWatcher-content.js
diff --git a/toolkit/components/perfmonitoring/PerformanceWatcher.jsm b/components/perfmonitoring/PerformanceWatcher.jsm
index d0d034974..d0d034974 100644
--- a/toolkit/components/perfmonitoring/PerformanceWatcher.jsm
+++ b/components/perfmonitoring/PerformanceWatcher.jsm
diff --git a/toolkit/components/perfmonitoring/README.md b/components/perfmonitoring/README.md
index abd109e45..abd109e45 100644
--- a/toolkit/components/perfmonitoring/README.md
+++ b/components/perfmonitoring/README.md
diff --git a/toolkit/components/perfmonitoring/moz.build b/components/perfmonitoring/moz.build
index 51fb42690..51fb42690 100644
--- a/toolkit/components/perfmonitoring/moz.build
+++ b/components/perfmonitoring/moz.build
diff --git a/toolkit/components/perfmonitoring/nsIPerformanceStats.idl b/components/perfmonitoring/nsIPerformanceStats.idl
index edc2d2edc..edc2d2edc 100644
--- a/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
+++ b/components/perfmonitoring/nsIPerformanceStats.idl
diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/components/perfmonitoring/nsPerformanceStats.cpp
index 15a021bba..15a021bba 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
+++ b/components/perfmonitoring/nsPerformanceStats.cpp
diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.h b/components/perfmonitoring/nsPerformanceStats.h
index 661a78a1a..661a78a1a 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.h
+++ b/components/perfmonitoring/nsPerformanceStats.h
diff --git a/toolkit/components/places/locale/places.properties b/components/places/locale/places.properties
index 5c0134180..5c0134180 100644
--- a/toolkit/components/places/locale/places.properties
+++ b/components/places/locale/places.properties
diff --git a/toolkit/components/places/moz.build b/components/places/moz.build
index 540265537..540265537 100644
--- a/toolkit/components/places/moz.build
+++ b/components/places/moz.build
diff --git a/toolkit/components/places/nsPlacesAutoComplete.manifest b/components/places/nsPlacesAutoComplete.manifest
index eb704f449..eb704f449 100644
--- a/toolkit/components/places/nsPlacesAutoComplete.manifest
+++ b/components/places/nsPlacesAutoComplete.manifest
diff --git a/toolkit/components/places/public/mozIAsyncFavicons.idl b/components/places/public/mozIAsyncFavicons.idl
index f1be18278..f1be18278 100644
--- a/toolkit/components/places/public/mozIAsyncFavicons.idl
+++ b/components/places/public/mozIAsyncFavicons.idl
diff --git a/toolkit/components/places/public/mozIAsyncHistory.idl b/components/places/public/mozIAsyncHistory.idl
index 35c8cc3a6..35c8cc3a6 100644
--- a/toolkit/components/places/public/mozIAsyncHistory.idl
+++ b/components/places/public/mozIAsyncHistory.idl
diff --git a/toolkit/components/places/public/mozIAsyncLivemarks.idl b/components/places/public/mozIAsyncLivemarks.idl
index e84ecca8e..e84ecca8e 100644
--- a/toolkit/components/places/public/mozIAsyncLivemarks.idl
+++ b/components/places/public/mozIAsyncLivemarks.idl
diff --git a/toolkit/components/places/public/mozIColorAnalyzer.idl b/components/places/public/mozIColorAnalyzer.idl
index 368958cbb..368958cbb 100644
--- a/toolkit/components/places/public/mozIColorAnalyzer.idl
+++ b/components/places/public/mozIColorAnalyzer.idl
diff --git a/toolkit/components/places/public/mozIPlacesAutoComplete.idl b/components/places/public/mozIPlacesAutoComplete.idl
index 6ff82e667..6ff82e667 100644
--- a/toolkit/components/places/public/mozIPlacesAutoComplete.idl
+++ b/components/places/public/mozIPlacesAutoComplete.idl
diff --git a/toolkit/components/places/public/mozIPlacesPendingOperation.idl b/components/places/public/mozIPlacesPendingOperation.idl
index 678a90870..678a90870 100644
--- a/toolkit/components/places/public/mozIPlacesPendingOperation.idl
+++ b/components/places/public/mozIPlacesPendingOperation.idl
diff --git a/toolkit/components/places/public/nsIAnnotationService.idl b/components/places/public/nsIAnnotationService.idl
index bdd417ece..bdd417ece 100644
--- a/toolkit/components/places/public/nsIAnnotationService.idl
+++ b/components/places/public/nsIAnnotationService.idl
diff --git a/toolkit/components/places/public/nsIBrowserHistory.idl b/components/places/public/nsIBrowserHistory.idl
index 8f3265972..8f3265972 100644
--- a/toolkit/components/places/public/nsIBrowserHistory.idl
+++ b/components/places/public/nsIBrowserHistory.idl
diff --git a/toolkit/components/places/public/nsIFaviconService.idl b/components/places/public/nsIFaviconService.idl
index 25339d64b..25339d64b 100644
--- a/toolkit/components/places/public/nsIFaviconService.idl
+++ b/components/places/public/nsIFaviconService.idl
diff --git a/toolkit/components/places/public/nsINavBookmarksService.idl b/components/places/public/nsINavBookmarksService.idl
index e9e49a4f4..e9e49a4f4 100644
--- a/toolkit/components/places/public/nsINavBookmarksService.idl
+++ b/components/places/public/nsINavBookmarksService.idl
diff --git a/toolkit/components/places/public/nsINavHistoryService.idl b/components/places/public/nsINavHistoryService.idl
index 3fd851870..3fd851870 100644
--- a/toolkit/components/places/public/nsINavHistoryService.idl
+++ b/components/places/public/nsINavHistoryService.idl
diff --git a/toolkit/components/places/public/nsITaggingService.idl b/components/places/public/nsITaggingService.idl
index f3731feb6..f3731feb6 100644
--- a/toolkit/components/places/public/nsITaggingService.idl
+++ b/components/places/public/nsITaggingService.idl
diff --git a/toolkit/components/places/public/nsPIPlacesDatabase.idl b/components/places/public/nsPIPlacesDatabase.idl
index 5511b1be6..5511b1be6 100644
--- a/toolkit/components/places/public/nsPIPlacesDatabase.idl
+++ b/components/places/public/nsPIPlacesDatabase.idl
diff --git a/toolkit/components/places/src/BookmarkHTMLUtils.jsm b/components/places/src/BookmarkHTMLUtils.jsm
index 6b4ea7934..6b4ea7934 100644
--- a/toolkit/components/places/src/BookmarkHTMLUtils.jsm
+++ b/components/places/src/BookmarkHTMLUtils.jsm
diff --git a/toolkit/components/places/src/BookmarkJSONUtils.jsm b/components/places/src/BookmarkJSONUtils.jsm
index f212ba07d..f212ba07d 100644
--- a/toolkit/components/places/src/BookmarkJSONUtils.jsm
+++ b/components/places/src/BookmarkJSONUtils.jsm
diff --git a/toolkit/components/places/src/Bookmarks.jsm b/components/places/src/Bookmarks.jsm
index 835b4fc62..835b4fc62 100644
--- a/toolkit/components/places/src/Bookmarks.jsm
+++ b/components/places/src/Bookmarks.jsm
diff --git a/toolkit/components/places/src/ClusterLib.js b/components/places/src/ClusterLib.js
index ae5debff9..ae5debff9 100644
--- a/toolkit/components/places/src/ClusterLib.js
+++ b/components/places/src/ClusterLib.js
diff --git a/toolkit/components/places/src/ColorAnalyzer.js b/components/places/src/ColorAnalyzer.js
index 861ce7107..861ce7107 100644
--- a/toolkit/components/places/src/ColorAnalyzer.js
+++ b/components/places/src/ColorAnalyzer.js
diff --git a/toolkit/components/places/src/ColorAnalyzer_worker.js b/components/places/src/ColorAnalyzer_worker.js
index 01fce0637..01fce0637 100644
--- a/toolkit/components/places/src/ColorAnalyzer_worker.js
+++ b/components/places/src/ColorAnalyzer_worker.js
diff --git a/toolkit/components/places/src/ColorConversion.js b/components/places/src/ColorConversion.js
index b8a2c860d..b8a2c860d 100644
--- a/toolkit/components/places/src/ColorConversion.js
+++ b/components/places/src/ColorConversion.js
diff --git a/toolkit/components/places/src/Database.cpp b/components/places/src/Database.cpp
index 08c382377..08c382377 100644
--- a/toolkit/components/places/src/Database.cpp
+++ b/components/places/src/Database.cpp
diff --git a/toolkit/components/places/src/Database.h b/components/places/src/Database.h
index 22488fddb..22488fddb 100644
--- a/toolkit/components/places/src/Database.h
+++ b/components/places/src/Database.h
diff --git a/toolkit/components/places/src/ExtensionSearchHandler.jsm b/components/places/src/ExtensionSearchHandler.jsm
index 3eb699ca1..3eb699ca1 100644
--- a/toolkit/components/places/src/ExtensionSearchHandler.jsm
+++ b/components/places/src/ExtensionSearchHandler.jsm
diff --git a/toolkit/components/places/src/FaviconHelpers.cpp b/components/places/src/FaviconHelpers.cpp
index ca08cdff4..ca08cdff4 100644
--- a/toolkit/components/places/src/FaviconHelpers.cpp
+++ b/components/places/src/FaviconHelpers.cpp
diff --git a/toolkit/components/places/src/FaviconHelpers.h b/components/places/src/FaviconHelpers.h
index 1c6d5b2bf..1c6d5b2bf 100644
--- a/toolkit/components/places/src/FaviconHelpers.h
+++ b/components/places/src/FaviconHelpers.h
diff --git a/toolkit/components/places/src/Helpers.cpp b/components/places/src/Helpers.cpp
index 13e040bfd..13e040bfd 100644
--- a/toolkit/components/places/src/Helpers.cpp
+++ b/components/places/src/Helpers.cpp
diff --git a/toolkit/components/places/src/Helpers.h b/components/places/src/Helpers.h
index 4e79abc75..4e79abc75 100644
--- a/toolkit/components/places/src/Helpers.h
+++ b/components/places/src/Helpers.h
diff --git a/toolkit/components/places/src/History.cpp b/components/places/src/History.cpp
index e9c27d1d6..e9c27d1d6 100644
--- a/toolkit/components/places/src/History.cpp
+++ b/components/places/src/History.cpp
diff --git a/toolkit/components/places/src/History.h b/components/places/src/History.h
index 504232ca5..504232ca5 100644
--- a/toolkit/components/places/src/History.h
+++ b/components/places/src/History.h
diff --git a/toolkit/components/places/src/History.jsm b/components/places/src/History.jsm
index 59c24fcc6..59c24fcc6 100644
--- a/toolkit/components/places/src/History.jsm
+++ b/components/places/src/History.jsm
diff --git a/toolkit/components/places/src/PageIconProtocolHandler.js b/components/places/src/PageIconProtocolHandler.js
index 05e43ccf3..05e43ccf3 100644
--- a/toolkit/components/places/src/PageIconProtocolHandler.js
+++ b/components/places/src/PageIconProtocolHandler.js
diff --git a/toolkit/components/places/src/PlaceInfo.cpp b/components/places/src/PlaceInfo.cpp
index 760b0e718..760b0e718 100644
--- a/toolkit/components/places/src/PlaceInfo.cpp
+++ b/components/places/src/PlaceInfo.cpp
diff --git a/toolkit/components/places/src/PlaceInfo.h b/components/places/src/PlaceInfo.h
index b1d3c0893..b1d3c0893 100644
--- a/toolkit/components/places/src/PlaceInfo.h
+++ b/components/places/src/PlaceInfo.h
diff --git a/toolkit/components/places/src/PlacesBackups.jsm b/components/places/src/PlacesBackups.jsm
index 3cf89d530..3cf89d530 100644
--- a/toolkit/components/places/src/PlacesBackups.jsm
+++ b/components/places/src/PlacesBackups.jsm
diff --git a/toolkit/components/places/src/PlacesCategoriesStarter.js b/components/places/src/PlacesCategoriesStarter.js
index dd0ff2a25..dd0ff2a25 100644
--- a/toolkit/components/places/src/PlacesCategoriesStarter.js
+++ b/components/places/src/PlacesCategoriesStarter.js
diff --git a/toolkit/components/places/src/PlacesDBUtils.jsm b/components/places/src/PlacesDBUtils.jsm
index cfb38db70..cfb38db70 100644
--- a/toolkit/components/places/src/PlacesDBUtils.jsm
+++ b/components/places/src/PlacesDBUtils.jsm
diff --git a/toolkit/components/places/src/PlacesRemoteTabsAutocompleteProvider.jsm b/components/places/src/PlacesRemoteTabsAutocompleteProvider.jsm
index c3bc501eb..c3bc501eb 100644
--- a/toolkit/components/places/src/PlacesRemoteTabsAutocompleteProvider.jsm
+++ b/components/places/src/PlacesRemoteTabsAutocompleteProvider.jsm
diff --git a/toolkit/components/places/src/PlacesSearchAutocompleteProvider.jsm b/components/places/src/PlacesSearchAutocompleteProvider.jsm
index f4d8f3973..f4d8f3973 100644
--- a/toolkit/components/places/src/PlacesSearchAutocompleteProvider.jsm
+++ b/components/places/src/PlacesSearchAutocompleteProvider.jsm
diff --git a/toolkit/components/places/src/PlacesSyncUtils.jsm b/components/places/src/PlacesSyncUtils.jsm
index 15dd412e8..15dd412e8 100644
--- a/toolkit/components/places/src/PlacesSyncUtils.jsm
+++ b/components/places/src/PlacesSyncUtils.jsm
diff --git a/toolkit/components/places/src/PlacesTransactions.jsm b/components/places/src/PlacesTransactions.jsm
index c355d92b6..c355d92b6 100644
--- a/toolkit/components/places/src/PlacesTransactions.jsm
+++ b/components/places/src/PlacesTransactions.jsm
diff --git a/toolkit/components/places/src/PlacesUtils.jsm b/components/places/src/PlacesUtils.jsm
index ab753ba86..ab753ba86 100644
--- a/toolkit/components/places/src/PlacesUtils.jsm
+++ b/components/places/src/PlacesUtils.jsm
diff --git a/toolkit/components/places/src/SQLFunctions.cpp b/components/places/src/SQLFunctions.cpp
index e3cc7d7f0..e3cc7d7f0 100644
--- a/toolkit/components/places/src/SQLFunctions.cpp
+++ b/components/places/src/SQLFunctions.cpp
diff --git a/toolkit/components/places/src/SQLFunctions.h b/components/places/src/SQLFunctions.h
index bba159345..bba159345 100644
--- a/toolkit/components/places/src/SQLFunctions.h
+++ b/components/places/src/SQLFunctions.h
diff --git a/toolkit/components/places/src/Shutdown.cpp b/components/places/src/Shutdown.cpp
index 43586542b..43586542b 100644
--- a/toolkit/components/places/src/Shutdown.cpp
+++ b/components/places/src/Shutdown.cpp
diff --git a/toolkit/components/places/src/Shutdown.h b/components/places/src/Shutdown.h
index 69023c608..69023c608 100644
--- a/toolkit/components/places/src/Shutdown.h
+++ b/components/places/src/Shutdown.h
diff --git a/toolkit/components/places/src/UnifiedComplete.js b/components/places/src/UnifiedComplete.js
index 3cce88b38..3cce88b38 100644
--- a/toolkit/components/places/src/UnifiedComplete.js
+++ b/components/places/src/UnifiedComplete.js
diff --git a/toolkit/components/places/src/VisitInfo.cpp b/components/places/src/VisitInfo.cpp
index cd3ec2f79..cd3ec2f79 100644
--- a/toolkit/components/places/src/VisitInfo.cpp
+++ b/components/places/src/VisitInfo.cpp
diff --git a/toolkit/components/places/src/VisitInfo.h b/components/places/src/VisitInfo.h
index 54b25c686..54b25c686 100644
--- a/toolkit/components/places/src/VisitInfo.h
+++ b/components/places/src/VisitInfo.h
diff --git a/toolkit/components/places/src/nsAnnoProtocolHandler.cpp b/components/places/src/nsAnnoProtocolHandler.cpp
index b98942e33..b98942e33 100644
--- a/toolkit/components/places/src/nsAnnoProtocolHandler.cpp
+++ b/components/places/src/nsAnnoProtocolHandler.cpp
diff --git a/toolkit/components/places/src/nsAnnoProtocolHandler.h b/components/places/src/nsAnnoProtocolHandler.h
index 8e543c7c5..8e543c7c5 100644
--- a/toolkit/components/places/src/nsAnnoProtocolHandler.h
+++ b/components/places/src/nsAnnoProtocolHandler.h
diff --git a/toolkit/components/places/src/nsAnnotationService.cpp b/components/places/src/nsAnnotationService.cpp
index 9d62bd34a..9d62bd34a 100644
--- a/toolkit/components/places/src/nsAnnotationService.cpp
+++ b/components/places/src/nsAnnotationService.cpp
diff --git a/toolkit/components/places/src/nsAnnotationService.h b/components/places/src/nsAnnotationService.h
index f1b4921d8..f1b4921d8 100644
--- a/toolkit/components/places/src/nsAnnotationService.h
+++ b/components/places/src/nsAnnotationService.h
diff --git a/toolkit/components/places/src/nsFaviconService.cpp b/components/places/src/nsFaviconService.cpp
index e310db214..e310db214 100644
--- a/toolkit/components/places/src/nsFaviconService.cpp
+++ b/components/places/src/nsFaviconService.cpp
diff --git a/toolkit/components/places/src/nsFaviconService.h b/components/places/src/nsFaviconService.h
index b2fcdbeaa..b2fcdbeaa 100644
--- a/toolkit/components/places/src/nsFaviconService.h
+++ b/components/places/src/nsFaviconService.h
diff --git a/toolkit/components/places/src/nsLivemarkService.js b/components/places/src/nsLivemarkService.js
index eeca7e139..eeca7e139 100644
--- a/toolkit/components/places/src/nsLivemarkService.js
+++ b/components/places/src/nsLivemarkService.js
diff --git a/toolkit/components/places/src/nsMaybeWeakPtr.h b/components/places/src/nsMaybeWeakPtr.h
index ce52e5090..ce52e5090 100644
--- a/toolkit/components/places/src/nsMaybeWeakPtr.h
+++ b/components/places/src/nsMaybeWeakPtr.h
diff --git a/toolkit/components/places/src/nsNavBookmarks.cpp b/components/places/src/nsNavBookmarks.cpp
index 693aaf5db..693aaf5db 100644
--- a/toolkit/components/places/src/nsNavBookmarks.cpp
+++ b/components/places/src/nsNavBookmarks.cpp
diff --git a/toolkit/components/places/src/nsNavBookmarks.h b/components/places/src/nsNavBookmarks.h
index d5cc3b5b7..d5cc3b5b7 100644
--- a/toolkit/components/places/src/nsNavBookmarks.h
+++ b/components/places/src/nsNavBookmarks.h
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/components/places/src/nsNavHistory.cpp
index cf4edc633..cf4edc633 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/components/places/src/nsNavHistory.cpp
diff --git a/toolkit/components/places/src/nsNavHistory.h b/components/places/src/nsNavHistory.h
index c6e1133ff..c6e1133ff 100644
--- a/toolkit/components/places/src/nsNavHistory.h
+++ b/components/places/src/nsNavHistory.h
diff --git a/toolkit/components/places/src/nsNavHistoryQuery.cpp b/components/places/src/nsNavHistoryQuery.cpp
index 1a7b1c239..1a7b1c239 100644
--- a/toolkit/components/places/src/nsNavHistoryQuery.cpp
+++ b/components/places/src/nsNavHistoryQuery.cpp
diff --git a/toolkit/components/places/src/nsNavHistoryQuery.h b/components/places/src/nsNavHistoryQuery.h
index d1a8b759a..d1a8b759a 100644
--- a/toolkit/components/places/src/nsNavHistoryQuery.h
+++ b/components/places/src/nsNavHistoryQuery.h
diff --git a/toolkit/components/places/src/nsNavHistoryResult.cpp b/components/places/src/nsNavHistoryResult.cpp
index 64d06308f..64d06308f 100644
--- a/toolkit/components/places/src/nsNavHistoryResult.cpp
+++ b/components/places/src/nsNavHistoryResult.cpp
diff --git a/toolkit/components/places/src/nsNavHistoryResult.h b/components/places/src/nsNavHistoryResult.h
index fffe2bf13..fffe2bf13 100644
--- a/toolkit/components/places/src/nsNavHistoryResult.h
+++ b/components/places/src/nsNavHistoryResult.h
diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/components/places/src/nsPlacesAutoComplete.js
index 88de3a1f9..88de3a1f9 100644
--- a/toolkit/components/places/src/nsPlacesAutoComplete.js
+++ b/components/places/src/nsPlacesAutoComplete.js
diff --git a/toolkit/components/places/src/nsPlacesExpiration.js b/components/places/src/nsPlacesExpiration.js
index 0f376626d..0f376626d 100644
--- a/toolkit/components/places/src/nsPlacesExpiration.js
+++ b/components/places/src/nsPlacesExpiration.js
diff --git a/toolkit/components/places/src/nsPlacesIndexes.h b/components/places/src/nsPlacesIndexes.h
index 9cce5a0aa..9cce5a0aa 100644
--- a/toolkit/components/places/src/nsPlacesIndexes.h
+++ b/components/places/src/nsPlacesIndexes.h
diff --git a/toolkit/components/places/src/nsPlacesMacros.h b/components/places/src/nsPlacesMacros.h
index 47ebe17ac..47ebe17ac 100644
--- a/toolkit/components/places/src/nsPlacesMacros.h
+++ b/components/places/src/nsPlacesMacros.h
diff --git a/toolkit/components/places/src/nsPlacesModule.cpp b/components/places/src/nsPlacesModule.cpp
index 679d460b4..679d460b4 100644
--- a/toolkit/components/places/src/nsPlacesModule.cpp
+++ b/components/places/src/nsPlacesModule.cpp
diff --git a/toolkit/components/places/src/nsPlacesTables.h b/components/places/src/nsPlacesTables.h
index 0b6e414fb..0b6e414fb 100644
--- a/toolkit/components/places/src/nsPlacesTables.h
+++ b/components/places/src/nsPlacesTables.h
diff --git a/toolkit/components/places/src/nsPlacesTriggers.h b/components/places/src/nsPlacesTriggers.h
index 37871a3eb..37871a3eb 100644
--- a/toolkit/components/places/src/nsPlacesTriggers.h
+++ b/components/places/src/nsPlacesTriggers.h
diff --git a/toolkit/components/places/src/nsTaggingService.js b/components/places/src/nsTaggingService.js
index e367e6cb3..e367e6cb3 100644
--- a/toolkit/components/places/src/nsTaggingService.js
+++ b/components/places/src/nsTaggingService.js
diff --git a/toolkit/components/places/toolkitplaces.manifest b/components/places/toolkitplaces.manifest
index cd9665200..cd9665200 100644
--- a/toolkit/components/places/toolkitplaces.manifest
+++ b/components/places/toolkitplaces.manifest
diff --git a/toolkit/components/pluginproblem/content/pluginProblem.xml b/components/pluginproblem/content/pluginProblem.xml
index d890be900..d890be900 100644
--- a/toolkit/components/pluginproblem/content/pluginProblem.xml
+++ b/components/pluginproblem/content/pluginProblem.xml
diff --git a/toolkit/components/pluginproblem/content/pluginProblemBinding.css b/components/pluginproblem/content/pluginProblemBinding.css
index a545e3eba..a545e3eba 100644
--- a/toolkit/components/pluginproblem/content/pluginProblemBinding.css
+++ b/components/pluginproblem/content/pluginProblemBinding.css
diff --git a/toolkit/components/pluginproblem/content/pluginProblemContent.css b/components/pluginproblem/content/pluginProblemContent.css
index cf8755635..cf8755635 100644
--- a/toolkit/components/pluginproblem/content/pluginProblemContent.css
+++ b/components/pluginproblem/content/pluginProblemContent.css
diff --git a/toolkit/components/pluginproblem/content/pluginReplaceBinding.css b/components/pluginproblem/content/pluginReplaceBinding.css
index 405a3a4b7..405a3a4b7 100644
--- a/toolkit/components/pluginproblem/content/pluginReplaceBinding.css
+++ b/components/pluginproblem/content/pluginReplaceBinding.css
diff --git a/toolkit/components/pluginproblem/jar.mn b/components/pluginproblem/jar.mn
index c027793de..c027793de 100644
--- a/toolkit/components/pluginproblem/jar.mn
+++ b/components/pluginproblem/jar.mn
diff --git a/toolkit/components/pluginproblem/locale/pluginproblem.dtd b/components/pluginproblem/locale/pluginproblem.dtd
index 841655127..841655127 100644
--- a/toolkit/components/pluginproblem/locale/pluginproblem.dtd
+++ b/components/pluginproblem/locale/pluginproblem.dtd
diff --git a/toolkit/components/pluginproblem/moz.build b/components/pluginproblem/moz.build
index 6cbc9e09c..6cbc9e09c 100644
--- a/toolkit/components/pluginproblem/moz.build
+++ b/components/pluginproblem/moz.build
diff --git a/toolkit/components/pluginproblem/pluginGlue.manifest b/components/pluginproblem/pluginGlue.manifest
index 96ebc9bd4..96ebc9bd4 100644
--- a/toolkit/components/pluginproblem/pluginGlue.manifest
+++ b/components/pluginproblem/pluginGlue.manifest
diff --git a/toolkit/components/preferences/content/changemp.js b/components/preferences/content/changemp.js
index 71664b3e1..71664b3e1 100644
--- a/toolkit/components/preferences/content/changemp.js
+++ b/components/preferences/content/changemp.js
diff --git a/toolkit/components/preferences/content/changemp.xul b/components/preferences/content/changemp.xul
index b316fa42b..b316fa42b 100644
--- a/toolkit/components/preferences/content/changemp.xul
+++ b/components/preferences/content/changemp.xul
diff --git a/toolkit/components/preferences/content/fontbuilder.js b/components/preferences/content/fontbuilder.js
index a76ce6b25..a76ce6b25 100644
--- a/toolkit/components/preferences/content/fontbuilder.js
+++ b/components/preferences/content/fontbuilder.js
diff --git a/toolkit/components/preferences/content/removemp.js b/components/preferences/content/removemp.js
index 1f6356eac..1f6356eac 100644
--- a/toolkit/components/preferences/content/removemp.js
+++ b/components/preferences/content/removemp.js
diff --git a/toolkit/components/preferences/content/removemp.xul b/components/preferences/content/removemp.xul
index 17ab48e39..17ab48e39 100644
--- a/toolkit/components/preferences/content/removemp.xul
+++ b/components/preferences/content/removemp.xul
diff --git a/toolkit/components/preferences/jar.mn b/components/preferences/jar.mn
index a7dfb958a..a7dfb958a 100644
--- a/toolkit/components/preferences/jar.mn
+++ b/components/preferences/jar.mn
diff --git a/toolkit/components/preferences/locale/changemp.dtd b/components/preferences/locale/changemp.dtd
index 1b1d5ac55..1b1d5ac55 100644
--- a/toolkit/components/preferences/locale/changemp.dtd
+++ b/components/preferences/locale/changemp.dtd
diff --git a/toolkit/components/preferences/locale/preferences.properties b/components/preferences/locale/preferences.properties
index 53750fcf3..53750fcf3 100644
--- a/toolkit/components/preferences/locale/preferences.properties
+++ b/components/preferences/locale/preferences.properties
diff --git a/toolkit/components/preferences/locale/removemp.dtd b/components/preferences/locale/removemp.dtd
index 24f234032..24f234032 100644
--- a/toolkit/components/preferences/locale/removemp.dtd
+++ b/components/preferences/locale/removemp.dtd
diff --git a/toolkit/components/preferences/moz.build b/components/preferences/moz.build
index 635fa39c9..635fa39c9 100644
--- a/toolkit/components/preferences/moz.build
+++ b/components/preferences/moz.build
diff --git a/toolkit/components/printing/content/printPageSetup.js b/components/printing/content/printPageSetup.js
index 6bcd97207..6bcd97207 100644
--- a/toolkit/components/printing/content/printPageSetup.js
+++ b/components/printing/content/printPageSetup.js
diff --git a/toolkit/components/printing/content/printPageSetup.xul b/components/printing/content/printPageSetup.xul
index a0c3afe17..a0c3afe17 100644
--- a/toolkit/components/printing/content/printPageSetup.xul
+++ b/components/printing/content/printPageSetup.xul
diff --git a/toolkit/components/printing/content/printPreviewBindings.xml b/components/printing/content/printPreviewBindings.xml
index c33b22e36..c33b22e36 100644
--- a/toolkit/components/printing/content/printPreviewBindings.xml
+++ b/components/printing/content/printPreviewBindings.xml
diff --git a/toolkit/components/printing/content/printPreviewProgress.js b/components/printing/content/printPreviewProgress.js
index 5c769e50a..5c769e50a 100644
--- a/toolkit/components/printing/content/printPreviewProgress.js
+++ b/components/printing/content/printPreviewProgress.js
diff --git a/toolkit/components/printing/content/printPreviewProgress.xul b/components/printing/content/printPreviewProgress.xul
index fa2b9b61d..fa2b9b61d 100644
--- a/toolkit/components/printing/content/printPreviewProgress.xul
+++ b/components/printing/content/printPreviewProgress.xul
diff --git a/toolkit/components/printing/content/printProgress.js b/components/printing/content/printProgress.js
index 6cadfe45e..6cadfe45e 100644
--- a/toolkit/components/printing/content/printProgress.js
+++ b/components/printing/content/printProgress.js
diff --git a/toolkit/components/printing/content/printProgress.xul b/components/printing/content/printProgress.xul
index 2d724e54f..2d724e54f 100644
--- a/toolkit/components/printing/content/printProgress.xul
+++ b/components/printing/content/printProgress.xul
diff --git a/toolkit/components/printing/content/printUtils.js b/components/printing/content/printUtils.js
index 62602396c..62602396c 100644
--- a/toolkit/components/printing/content/printUtils.js
+++ b/components/printing/content/printUtils.js
diff --git a/toolkit/components/printing/content/printdialog.js b/components/printing/content/printdialog.js
index f9ed94bad..f9ed94bad 100644
--- a/toolkit/components/printing/content/printdialog.js
+++ b/components/printing/content/printdialog.js
diff --git a/toolkit/components/printing/content/printdialog.xul b/components/printing/content/printdialog.xul
index d6452945b..d6452945b 100644
--- a/toolkit/components/printing/content/printdialog.xul
+++ b/components/printing/content/printdialog.xul
diff --git a/toolkit/components/printing/content/printjoboptions.js b/components/printing/content/printjoboptions.js
index 098358940..098358940 100644
--- a/toolkit/components/printing/content/printjoboptions.js
+++ b/components/printing/content/printjoboptions.js
diff --git a/toolkit/components/printing/content/printjoboptions.xul b/components/printing/content/printjoboptions.xul
index 5726dfe3f..5726dfe3f 100644
--- a/toolkit/components/printing/content/printjoboptions.xul
+++ b/components/printing/content/printjoboptions.xul
diff --git a/toolkit/components/printing/content/simplifyMode.css b/components/printing/content/simplifyMode.css
index d02f216dc..d02f216dc 100644
--- a/toolkit/components/printing/content/simplifyMode.css
+++ b/components/printing/content/simplifyMode.css
diff --git a/toolkit/components/printing/jar.mn b/components/printing/jar.mn
index f77cf1c6a..f77cf1c6a 100644
--- a/toolkit/components/printing/jar.mn
+++ b/components/printing/jar.mn
diff --git a/toolkit/components/printing/moz.build b/components/printing/moz.build
index aee4b90a5..aee4b90a5 100644
--- a/toolkit/components/printing/moz.build
+++ b/components/printing/moz.build
diff --git a/toolkit/components/privatebrowsing/PrivateBrowsing.manifest b/components/privatebrowsing/PrivateBrowsing.manifest
index 36b39bb85..36b39bb85 100644
--- a/toolkit/components/privatebrowsing/PrivateBrowsing.manifest
+++ b/components/privatebrowsing/PrivateBrowsing.manifest
diff --git a/toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js b/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
index 5c1c27874..5c1c27874 100644
--- a/toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
+++ b/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
diff --git a/toolkit/components/privatebrowsing/moz.build b/components/privatebrowsing/moz.build
index 834329e1d..834329e1d 100644
--- a/toolkit/components/privatebrowsing/moz.build
+++ b/components/privatebrowsing/moz.build
diff --git a/toolkit/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl b/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl
index d572b4e7e..d572b4e7e 100644
--- a/toolkit/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl
+++ b/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl
diff --git a/toolkit/components/processsingleton/ContentProcessSingleton.js b/components/processsingleton/ContentProcessSingleton.js
index 72f5803e1..72f5803e1 100644
--- a/toolkit/components/processsingleton/ContentProcessSingleton.js
+++ b/components/processsingleton/ContentProcessSingleton.js
diff --git a/toolkit/components/processsingleton/MainProcessSingleton.js b/components/processsingleton/MainProcessSingleton.js
index 82beff508..82beff508 100644
--- a/toolkit/components/processsingleton/MainProcessSingleton.js
+++ b/components/processsingleton/MainProcessSingleton.js
diff --git a/toolkit/components/processsingleton/ProcessSingleton.manifest b/components/processsingleton/ProcessSingleton.manifest
index 7a882ed7b..7a882ed7b 100644
--- a/toolkit/components/processsingleton/ProcessSingleton.manifest
+++ b/components/processsingleton/ProcessSingleton.manifest
diff --git a/toolkit/components/processsingleton/moz.build b/components/processsingleton/moz.build
index 9da775820..9da775820 100644
--- a/toolkit/components/processsingleton/moz.build
+++ b/components/processsingleton/moz.build
diff --git a/toolkit/components/profile/content/createProfileWizard.js b/components/profile/content/createProfileWizard.js
index f378f3676..f378f3676 100644
--- a/toolkit/components/profile/content/createProfileWizard.js
+++ b/components/profile/content/createProfileWizard.js
diff --git a/toolkit/components/profile/content/createProfileWizard.xul b/components/profile/content/createProfileWizard.xul
index c7e0702a6..c7e0702a6 100644
--- a/toolkit/components/profile/content/createProfileWizard.xul
+++ b/components/profile/content/createProfileWizard.xul
diff --git a/toolkit/components/profile/content/profileSelection.js b/components/profile/content/profileSelection.js
index 9fb77dfcd..9fb77dfcd 100644
--- a/toolkit/components/profile/content/profileSelection.js
+++ b/components/profile/content/profileSelection.js
diff --git a/toolkit/components/profile/content/profileSelection.xul b/components/profile/content/profileSelection.xul
index e5dfabb42..e5dfabb42 100644
--- a/toolkit/components/profile/content/profileSelection.xul
+++ b/components/profile/content/profileSelection.xul
diff --git a/toolkit/components/profile/jar.mn b/components/profile/jar.mn
index 9b7c22266..9b7c22266 100644
--- a/toolkit/components/profile/jar.mn
+++ b/components/profile/jar.mn
diff --git a/toolkit/components/profile/locale/createProfileWizard.dtd b/components/profile/locale/createProfileWizard.dtd
index 55384350a..55384350a 100644
--- a/toolkit/components/profile/locale/createProfileWizard.dtd
+++ b/components/profile/locale/createProfileWizard.dtd
diff --git a/toolkit/components/profile/locale/profileSelection.dtd b/components/profile/locale/profileSelection.dtd
index 87741a82e..87741a82e 100644
--- a/toolkit/components/profile/locale/profileSelection.dtd
+++ b/components/profile/locale/profileSelection.dtd
diff --git a/toolkit/components/profile/locale/profileSelection.properties b/components/profile/locale/profileSelection.properties
index e36353a93..e36353a93 100644
--- a/toolkit/components/profile/locale/profileSelection.properties
+++ b/components/profile/locale/profileSelection.properties
diff --git a/toolkit/components/profile/moz.build b/components/profile/moz.build
index 9b821de02..9b821de02 100644
--- a/toolkit/components/profile/moz.build
+++ b/components/profile/moz.build
diff --git a/toolkit/components/profile/notifications.txt b/components/profile/notifications.txt
index eab1e2c34..eab1e2c34 100644
--- a/toolkit/components/profile/notifications.txt
+++ b/components/profile/notifications.txt
diff --git a/toolkit/components/profile/public/nsIProfileMigrator.idl b/components/profile/public/nsIProfileMigrator.idl
index e2351ca9b..e2351ca9b 100644
--- a/toolkit/components/profile/public/nsIProfileMigrator.idl
+++ b/components/profile/public/nsIProfileMigrator.idl
diff --git a/toolkit/components/profile/public/nsIProfileUnlocker.idl b/components/profile/public/nsIProfileUnlocker.idl
index cd1a71051..cd1a71051 100644
--- a/toolkit/components/profile/public/nsIProfileUnlocker.idl
+++ b/components/profile/public/nsIProfileUnlocker.idl
diff --git a/toolkit/components/profile/public/nsIToolkitProfile.idl b/components/profile/public/nsIToolkitProfile.idl
index 8d0c07c51..8d0c07c51 100644
--- a/toolkit/components/profile/public/nsIToolkitProfile.idl
+++ b/components/profile/public/nsIToolkitProfile.idl
diff --git a/toolkit/components/profile/public/nsIToolkitProfileService.idl b/components/profile/public/nsIToolkitProfileService.idl
index 46a5b3cbc..46a5b3cbc 100644
--- a/toolkit/components/profile/public/nsIToolkitProfileService.idl
+++ b/components/profile/public/nsIToolkitProfileService.idl
diff --git a/toolkit/components/profile/src/ProfileUnlockerWin.cpp b/components/profile/src/ProfileUnlockerWin.cpp
index 4e0ed7196..4e0ed7196 100644
--- a/toolkit/components/profile/src/ProfileUnlockerWin.cpp
+++ b/components/profile/src/ProfileUnlockerWin.cpp
diff --git a/toolkit/components/profile/src/ProfileUnlockerWin.h b/components/profile/src/ProfileUnlockerWin.h
index 0a7dff527..0a7dff527 100644
--- a/toolkit/components/profile/src/ProfileUnlockerWin.h
+++ b/components/profile/src/ProfileUnlockerWin.h
diff --git a/toolkit/components/profile/src/nsProfileLock.cpp b/components/profile/src/nsProfileLock.cpp
index 654fbcd46..654fbcd46 100644
--- a/toolkit/components/profile/src/nsProfileLock.cpp
+++ b/components/profile/src/nsProfileLock.cpp
diff --git a/toolkit/components/profile/src/nsProfileLock.h b/components/profile/src/nsProfileLock.h
index e78a3577e..e78a3577e 100644
--- a/toolkit/components/profile/src/nsProfileLock.h
+++ b/components/profile/src/nsProfileLock.h
diff --git a/toolkit/components/profile/src/nsProfileStringTypes.h b/components/profile/src/nsProfileStringTypes.h
index fddea519b..fddea519b 100644
--- a/toolkit/components/profile/src/nsProfileStringTypes.h
+++ b/components/profile/src/nsProfileStringTypes.h
diff --git a/toolkit/components/profile/src/nsToolkitProfileService.cpp b/components/profile/src/nsToolkitProfileService.cpp
index 3380246da..3380246da 100644
--- a/toolkit/components/profile/src/nsToolkitProfileService.cpp
+++ b/components/profile/src/nsToolkitProfileService.cpp
diff --git a/toolkit/components/promiseworker/PromiseWorker.jsm b/components/promiseworker/PromiseWorker.jsm
index 0c6e054a2..0c6e054a2 100644
--- a/toolkit/components/promiseworker/PromiseWorker.jsm
+++ b/components/promiseworker/PromiseWorker.jsm
diff --git a/toolkit/components/promiseworker/moz.build b/components/promiseworker/moz.build
index f14062b63..f14062b63 100644
--- a/toolkit/components/promiseworker/moz.build
+++ b/components/promiseworker/moz.build
diff --git a/toolkit/components/promiseworker/worker/PromiseWorker.js b/components/promiseworker/worker/PromiseWorker.js
index ba4408c1a..ba4408c1a 100644
--- a/toolkit/components/promiseworker/worker/PromiseWorker.js
+++ b/components/promiseworker/worker/PromiseWorker.js
diff --git a/toolkit/components/promiseworker/worker/moz.build b/components/promiseworker/worker/moz.build
index abac4be46..abac4be46 100644
--- a/toolkit/components/promiseworker/worker/moz.build
+++ b/components/promiseworker/worker/moz.build
diff --git a/toolkit/components/prompts/content/commonDialog.css b/components/prompts/content/commonDialog.css
index 89f88db7a..89f88db7a 100644
--- a/toolkit/components/prompts/content/commonDialog.css
+++ b/components/prompts/content/commonDialog.css
diff --git a/toolkit/components/prompts/content/commonDialog.js b/components/prompts/content/commonDialog.js
index 70b373d1f..70b373d1f 100644
--- a/toolkit/components/prompts/content/commonDialog.js
+++ b/components/prompts/content/commonDialog.js
diff --git a/toolkit/components/prompts/content/commonDialog.xul b/components/prompts/content/commonDialog.xul
index a7621ccdf..a7621ccdf 100644
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/components/prompts/content/commonDialog.xul
diff --git a/toolkit/components/prompts/content/selectDialog.js b/components/prompts/content/selectDialog.js
index 7628dc8d9..7628dc8d9 100644
--- a/toolkit/components/prompts/content/selectDialog.js
+++ b/components/prompts/content/selectDialog.js
diff --git a/toolkit/components/prompts/content/selectDialog.xul b/components/prompts/content/selectDialog.xul
index 9b72bcfb0..9b72bcfb0 100644
--- a/toolkit/components/prompts/content/selectDialog.xul
+++ b/components/prompts/content/selectDialog.xul
diff --git a/toolkit/components/prompts/content/tabprompts.css b/components/prompts/content/tabprompts.css
index c4b0f7593..c4b0f7593 100644
--- a/toolkit/components/prompts/content/tabprompts.css
+++ b/components/prompts/content/tabprompts.css
diff --git a/toolkit/components/prompts/content/tabprompts.xml b/components/prompts/content/tabprompts.xml
index 5355bb4cf..5355bb4cf 100644
--- a/toolkit/components/prompts/content/tabprompts.xml
+++ b/components/prompts/content/tabprompts.xml
diff --git a/toolkit/components/prompts/jar.mn b/components/prompts/jar.mn
index 1b5da3f80..1b5da3f80 100644
--- a/toolkit/components/prompts/jar.mn
+++ b/components/prompts/jar.mn
diff --git a/toolkit/components/prompts/moz.build b/components/prompts/moz.build
index bce24006e..bce24006e 100644
--- a/toolkit/components/prompts/moz.build
+++ b/components/prompts/moz.build
diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/components/prompts/src/CommonDialog.jsm
index c4200feb3..c4200feb3 100644
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/components/prompts/src/CommonDialog.jsm
diff --git a/toolkit/components/prompts/src/SharedPromptUtils.jsm b/components/prompts/src/SharedPromptUtils.jsm
index b27096ac2..b27096ac2 100644
--- a/toolkit/components/prompts/src/SharedPromptUtils.jsm
+++ b/components/prompts/src/SharedPromptUtils.jsm
diff --git a/toolkit/components/prompts/src/moz.build b/components/prompts/src/moz.build
index 5311f1ed3..5311f1ed3 100644
--- a/toolkit/components/prompts/src/moz.build
+++ b/components/prompts/src/moz.build
diff --git a/toolkit/components/prompts/src/nsPrompter.js b/components/prompts/src/nsPrompter.js
index 0503b5925..0503b5925 100644
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/components/prompts/src/nsPrompter.js
diff --git a/toolkit/components/prompts/src/nsPrompter.manifest b/components/prompts/src/nsPrompter.manifest
index 582f6bf59..582f6bf59 100644
--- a/toolkit/components/prompts/src/nsPrompter.manifest
+++ b/components/prompts/src/nsPrompter.manifest
diff --git a/toolkit/components/proxy/moz.build b/components/proxy/moz.build
index 2d20820d4..2d20820d4 100644
--- a/toolkit/components/proxy/moz.build
+++ b/components/proxy/moz.build
diff --git a/toolkit/components/proxy/src/ProxyUtils.cpp b/components/proxy/src/ProxyUtils.cpp
index 4e59f226a..4e59f226a 100644
--- a/toolkit/components/proxy/src/ProxyUtils.cpp
+++ b/components/proxy/src/ProxyUtils.cpp
diff --git a/toolkit/components/proxy/src/ProxyUtils.h b/components/proxy/src/ProxyUtils.h
index 7d6ae220f..7d6ae220f 100644
--- a/toolkit/components/proxy/src/ProxyUtils.h
+++ b/components/proxy/src/ProxyUtils.h
diff --git a/toolkit/components/proxy/src/nsLibProxySettings.cpp b/components/proxy/src/nsLibProxySettings.cpp
index e9179c114..e9179c114 100644
--- a/toolkit/components/proxy/src/nsLibProxySettings.cpp
+++ b/components/proxy/src/nsLibProxySettings.cpp
diff --git a/toolkit/components/proxy/src/nsUnixSystemProxySettings.cpp b/components/proxy/src/nsUnixSystemProxySettings.cpp
index c190da91d..c190da91d 100644
--- a/toolkit/components/proxy/src/nsUnixSystemProxySettings.cpp
+++ b/components/proxy/src/nsUnixSystemProxySettings.cpp
diff --git a/toolkit/components/proxy/src/nsWindowsSystemProxySettings.cpp b/components/proxy/src/nsWindowsSystemProxySettings.cpp
index bb5f72b69..bb5f72b69 100644
--- a/toolkit/components/proxy/src/nsWindowsSystemProxySettings.cpp
+++ b/components/proxy/src/nsWindowsSystemProxySettings.cpp
diff --git a/toolkit/components/reader/.eslintrc.js b/components/reader/.eslintrc.js
index 617c1f9cf..617c1f9cf 100644
--- a/toolkit/components/reader/.eslintrc.js
+++ b/components/reader/.eslintrc.js
diff --git a/toolkit/components/reader/AboutReader.jsm b/components/reader/AboutReader.jsm
index 663e88050..663e88050 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/components/reader/AboutReader.jsm
diff --git a/toolkit/components/reader/JSDOMParser.js b/components/reader/JSDOMParser.js
index 2d3d6f156..2d3d6f156 100644
--- a/toolkit/components/reader/JSDOMParser.js
+++ b/components/reader/JSDOMParser.js
diff --git a/toolkit/components/reader/Readability-readerable.js b/components/reader/Readability-readerable.js
index 839d9fbf7..839d9fbf7 100644
--- a/toolkit/components/reader/Readability-readerable.js
+++ b/components/reader/Readability-readerable.js
diff --git a/toolkit/components/reader/Readability.js b/components/reader/Readability.js
index 4a3689885..4a3689885 100644
--- a/toolkit/components/reader/Readability.js
+++ b/components/reader/Readability.js
diff --git a/toolkit/components/reader/ReaderMode.jsm b/components/reader/ReaderMode.jsm
index a1d2c5643..a1d2c5643 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/components/reader/ReaderMode.jsm
diff --git a/toolkit/components/reader/ReaderWorker.js b/components/reader/ReaderWorker.js
index 9cc684e9b..9cc684e9b 100644
--- a/toolkit/components/reader/ReaderWorker.js
+++ b/components/reader/ReaderWorker.js
diff --git a/toolkit/components/reader/ReaderWorker.jsm b/components/reader/ReaderWorker.jsm
index ed0ea9aea..ed0ea9aea 100644
--- a/toolkit/components/reader/ReaderWorker.jsm
+++ b/components/reader/ReaderWorker.jsm
diff --git a/toolkit/components/reader/Readerable.js b/components/reader/Readerable.js
index cee8adc08..cee8adc08 100644
--- a/toolkit/components/reader/Readerable.js
+++ b/components/reader/Readerable.js
diff --git a/toolkit/components/reader/Readerable.jsm b/components/reader/Readerable.jsm
index 2268487e4..2268487e4 100644
--- a/toolkit/components/reader/Readerable.jsm
+++ b/components/reader/Readerable.jsm
diff --git a/toolkit/components/reader/content/aboutReader.html b/components/reader/content/aboutReader.html
index 58006c0a5..58006c0a5 100644
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/components/reader/content/aboutReader.html
diff --git a/toolkit/components/reader/content/aboutReader.js b/components/reader/content/aboutReader.js
index 6c963382e..6c963382e 100644
--- a/toolkit/components/reader/content/aboutReader.js
+++ b/components/reader/content/aboutReader.js
diff --git a/toolkit/components/reader/jar.mn b/components/reader/jar.mn
index 241f1e693..241f1e693 100644
--- a/toolkit/components/reader/jar.mn
+++ b/components/reader/jar.mn
diff --git a/toolkit/components/reader/moz.build b/components/reader/moz.build
index 322952b9f..322952b9f 100644
--- a/toolkit/components/reader/moz.build
+++ b/components/reader/moz.build
diff --git a/toolkit/components/reflect/moz.build b/components/reflect/moz.build
index 9a3f27116..9a3f27116 100644
--- a/toolkit/components/reflect/moz.build
+++ b/components/reflect/moz.build
diff --git a/toolkit/components/reflect/reflect.cpp b/components/reflect/reflect.cpp
index cd46baf7c..cd46baf7c 100644
--- a/toolkit/components/reflect/reflect.cpp
+++ b/components/reflect/reflect.cpp
diff --git a/toolkit/components/reflect/reflect.h b/components/reflect/reflect.h
index 6f5237104..6f5237104 100644
--- a/toolkit/components/reflect/reflect.h
+++ b/components/reflect/reflect.h
diff --git a/toolkit/components/reflect/reflect.jsm b/components/reflect/reflect.jsm
index fd1729dd9..fd1729dd9 100644
--- a/toolkit/components/reflect/reflect.jsm
+++ b/components/reflect/reflect.jsm
diff --git a/toolkit/components/remote/moz.build b/components/remote/moz.build
index 75926d9d9..75926d9d9 100644
--- a/toolkit/components/remote/moz.build
+++ b/components/remote/moz.build
diff --git a/toolkit/components/remote/nsGTKRemoteService.cpp b/components/remote/nsGTKRemoteService.cpp
index 860efe015..860efe015 100644
--- a/toolkit/components/remote/nsGTKRemoteService.cpp
+++ b/components/remote/nsGTKRemoteService.cpp
diff --git a/toolkit/components/remote/nsGTKRemoteService.h b/components/remote/nsGTKRemoteService.h
index 034a77a24..034a77a24 100644
--- a/toolkit/components/remote/nsGTKRemoteService.h
+++ b/components/remote/nsGTKRemoteService.h
diff --git a/toolkit/components/remote/nsIRemoteService.idl b/components/remote/nsIRemoteService.idl
index e8ba2f1c8..e8ba2f1c8 100644
--- a/toolkit/components/remote/nsIRemoteService.idl
+++ b/components/remote/nsIRemoteService.idl
diff --git a/toolkit/components/remote/nsXRemoteService.cpp b/components/remote/nsXRemoteService.cpp
index 41a40e471..41a40e471 100644
--- a/toolkit/components/remote/nsXRemoteService.cpp
+++ b/components/remote/nsXRemoteService.cpp
diff --git a/toolkit/components/remote/nsXRemoteService.h b/components/remote/nsXRemoteService.h
index 718633675..718633675 100644
--- a/toolkit/components/remote/nsXRemoteService.h
+++ b/components/remote/nsXRemoteService.h
diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js b/components/remotebrowserutils/RemoteWebNavigation.js
index 5790c0004..5790c0004 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js
+++ b/components/remotebrowserutils/RemoteWebNavigation.js
diff --git a/toolkit/components/remotebrowserutils/moz.build b/components/remotebrowserutils/moz.build
index b9fa9c4b5..b9fa9c4b5 100644
--- a/toolkit/components/remotebrowserutils/moz.build
+++ b/components/remotebrowserutils/moz.build
diff --git a/toolkit/components/remotebrowserutils/remotebrowserutils.manifest b/components/remotebrowserutils/remotebrowserutils.manifest
index d762d65a0..d762d65a0 100644
--- a/toolkit/components/remotebrowserutils/remotebrowserutils.manifest
+++ b/components/remotebrowserutils/remotebrowserutils.manifest
diff --git a/toolkit/components/satchel/AutoCompletePopup.jsm b/components/satchel/AutoCompletePopup.jsm
index 7604e7bd5..7604e7bd5 100644
--- a/toolkit/components/satchel/AutoCompletePopup.jsm
+++ b/components/satchel/AutoCompletePopup.jsm
diff --git a/toolkit/components/satchel/FormHistory.jsm b/components/satchel/FormHistory.jsm
index 2182fbfb7..2182fbfb7 100644
--- a/toolkit/components/satchel/FormHistory.jsm
+++ b/components/satchel/FormHistory.jsm
diff --git a/toolkit/components/satchel/FormHistoryStartup.js b/components/satchel/FormHistoryStartup.js
index 05b654560..05b654560 100644
--- a/toolkit/components/satchel/FormHistoryStartup.js
+++ b/components/satchel/FormHistoryStartup.js
diff --git a/toolkit/components/satchel/formSubmitListener.js b/components/satchel/formSubmitListener.js
index ec2c18f6c..ec2c18f6c 100644
--- a/toolkit/components/satchel/formSubmitListener.js
+++ b/components/satchel/formSubmitListener.js
diff --git a/toolkit/components/satchel/jar.mn b/components/satchel/jar.mn
index 4b37d5dc5..4b37d5dc5 100644
--- a/toolkit/components/satchel/jar.mn
+++ b/components/satchel/jar.mn
diff --git a/toolkit/components/satchel/moz.build b/components/satchel/moz.build
index cff8b594a..cff8b594a 100644
--- a/toolkit/components/satchel/moz.build
+++ b/components/satchel/moz.build
diff --git a/toolkit/components/satchel/nsFormAutoComplete.js b/components/satchel/nsFormAutoComplete.js
index 41f7425bb..41f7425bb 100644
--- a/toolkit/components/satchel/nsFormAutoComplete.js
+++ b/components/satchel/nsFormAutoComplete.js
diff --git a/toolkit/components/satchel/nsFormAutoCompleteResult.jsm b/components/satchel/nsFormAutoCompleteResult.jsm
index 07ef15fca..07ef15fca 100644
--- a/toolkit/components/satchel/nsFormAutoCompleteResult.jsm
+++ b/components/satchel/nsFormAutoCompleteResult.jsm
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/components/satchel/nsFormFillController.cpp
index 880ca79b2..880ca79b2 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/components/satchel/nsFormFillController.cpp
diff --git a/toolkit/components/satchel/nsFormFillController.h b/components/satchel/nsFormFillController.h
index 27fb1edbd..27fb1edbd 100644
--- a/toolkit/components/satchel/nsFormFillController.h
+++ b/components/satchel/nsFormFillController.h
diff --git a/toolkit/components/satchel/nsFormHistory.js b/components/satchel/nsFormHistory.js
index f940e104d..f940e104d 100644
--- a/toolkit/components/satchel/nsFormHistory.js
+++ b/components/satchel/nsFormHistory.js
diff --git a/toolkit/components/satchel/nsIFormAutoComplete.idl b/components/satchel/nsIFormAutoComplete.idl
index 6ce8563be..6ce8563be 100644
--- a/toolkit/components/satchel/nsIFormAutoComplete.idl
+++ b/components/satchel/nsIFormAutoComplete.idl
diff --git a/toolkit/components/satchel/nsIFormFillController.idl b/components/satchel/nsIFormFillController.idl
index 34104c91f..34104c91f 100644
--- a/toolkit/components/satchel/nsIFormFillController.idl
+++ b/components/satchel/nsIFormFillController.idl
diff --git a/toolkit/components/satchel/nsIFormHistory.idl b/components/satchel/nsIFormHistory.idl
index ac78451e9..ac78451e9 100644
--- a/toolkit/components/satchel/nsIFormHistory.idl
+++ b/components/satchel/nsIFormHistory.idl
diff --git a/toolkit/components/satchel/nsIInputListAutoComplete.idl b/components/satchel/nsIInputListAutoComplete.idl
index 6f0f492b0..6f0f492b0 100644
--- a/toolkit/components/satchel/nsIInputListAutoComplete.idl
+++ b/components/satchel/nsIInputListAutoComplete.idl
diff --git a/toolkit/components/satchel/nsInputListAutoComplete.js b/components/satchel/nsInputListAutoComplete.js
index f42427862..f42427862 100644
--- a/toolkit/components/satchel/nsInputListAutoComplete.js
+++ b/components/satchel/nsInputListAutoComplete.js
diff --git a/toolkit/components/satchel/satchel.manifest b/components/satchel/satchel.manifest
index 5afc0a38c..5afc0a38c 100644
--- a/toolkit/components/satchel/satchel.manifest
+++ b/components/satchel/satchel.manifest
diff --git a/toolkit/components/satchel/towel b/components/satchel/towel
index c26c7a8b2..c26c7a8b2 100644
--- a/toolkit/components/satchel/towel
+++ b/components/satchel/towel
diff --git a/toolkit/components/search/locale/search.properties b/components/search/locale/search.properties
index 8aeed6a6c..8aeed6a6c 100644
--- a/toolkit/components/search/locale/search.properties
+++ b/components/search/locale/search.properties
diff --git a/toolkit/components/search/moz.build b/components/search/moz.build
index e2feafa17..e2feafa17 100644
--- a/toolkit/components/search/moz.build
+++ b/components/search/moz.build
diff --git a/toolkit/components/search/src/SearchStaticData.jsm b/components/search/src/SearchStaticData.jsm
index de2be695c..de2be695c 100644
--- a/toolkit/components/search/src/SearchStaticData.jsm
+++ b/components/search/src/SearchStaticData.jsm
diff --git a/toolkit/components/search/src/SearchSuggestionController.jsm b/components/search/src/SearchSuggestionController.jsm
index 0858974bf..0858974bf 100644
--- a/toolkit/components/search/src/SearchSuggestionController.jsm
+++ b/components/search/src/SearchSuggestionController.jsm
diff --git a/toolkit/components/search/src/nsSearchService.js b/components/search/src/nsSearchService.js
index d85146e08..7b45e3064 100644
--- a/toolkit/components/search/src/nsSearchService.js
+++ b/components/search/src/nsSearchService.js
@@ -4521,4 +4521,4 @@ var engineUpdateService = {
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
 
-#include ../../../modules/debug.js
+#include ../../../toolkit/modules/debug.js
diff --git a/toolkit/components/search/src/nsSearchSuggestions.js b/components/search/src/nsSearchSuggestions.js
index a05d8b4b4..a05d8b4b4 100644
--- a/toolkit/components/search/src/nsSearchSuggestions.js
+++ b/components/search/src/nsSearchSuggestions.js
diff --git a/toolkit/components/search/src/nsSidebar.js b/components/search/src/nsSidebar.js
index deb455734..deb455734 100644
--- a/toolkit/components/search/src/nsSidebar.js
+++ b/components/search/src/nsSidebar.js
diff --git a/toolkit/components/search/toolkitsearch.manifest b/components/search/toolkitsearch.manifest
index b7c55da0e..b7c55da0e 100644
--- a/toolkit/components/search/toolkitsearch.manifest
+++ b/components/search/toolkitsearch.manifest
diff --git a/toolkit/components/startup/StartupTimeline.cpp b/components/startup/StartupTimeline.cpp
index 3b6785780..3b6785780 100644
--- a/toolkit/components/startup/StartupTimeline.cpp
+++ b/components/startup/StartupTimeline.cpp
diff --git a/toolkit/components/startup/StartupTimeline.h b/components/startup/StartupTimeline.h
index 0cdc5fce6..0cdc5fce6 100644
--- a/toolkit/components/startup/StartupTimeline.h
+++ b/components/startup/StartupTimeline.h
diff --git a/toolkit/components/startup/moz.build b/components/startup/moz.build
index 7ee23d9ce..7ee23d9ce 100644
--- a/toolkit/components/startup/moz.build
+++ b/components/startup/moz.build
diff --git a/toolkit/components/startup/mozprofilerprobe.mof b/components/startup/mozprofilerprobe.mof
index 03379ba1d..03379ba1d 100644
--- a/toolkit/components/startup/mozprofilerprobe.mof
+++ b/components/startup/mozprofilerprobe.mof
diff --git a/toolkit/components/startup/nsAppStartup.cpp b/components/startup/nsAppStartup.cpp
index 11a000270..11a000270 100644
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/components/startup/nsAppStartup.cpp
diff --git a/toolkit/components/startup/nsAppStartup.h b/components/startup/nsAppStartup.h
index 44c406ee4..44c406ee4 100644
--- a/toolkit/components/startup/nsAppStartup.h
+++ b/components/startup/nsAppStartup.h
diff --git a/toolkit/components/startup/nsUserInfo.h b/components/startup/nsUserInfo.h
index 49e86c64a..49e86c64a 100644
--- a/toolkit/components/startup/nsUserInfo.h
+++ b/components/startup/nsUserInfo.h
diff --git a/toolkit/components/startup/nsUserInfoUnix.cpp b/components/startup/nsUserInfoUnix.cpp
index 71bc46da2..71bc46da2 100644
--- a/toolkit/components/startup/nsUserInfoUnix.cpp
+++ b/components/startup/nsUserInfoUnix.cpp
diff --git a/toolkit/components/startup/nsUserInfoWin.cpp b/components/startup/nsUserInfoWin.cpp
index b27a2c483..b27a2c483 100644
--- a/toolkit/components/startup/nsUserInfoWin.cpp
+++ b/components/startup/nsUserInfoWin.cpp
diff --git a/toolkit/components/startup/public/moz.build b/components/startup/public/moz.build
index 07ea9429c..07ea9429c 100644
--- a/toolkit/components/startup/public/moz.build
+++ b/components/startup/public/moz.build
diff --git a/toolkit/components/startup/public/nsIAppStartup.idl b/components/startup/public/nsIAppStartup.idl
index 34705d39f..34705d39f 100644
--- a/toolkit/components/startup/public/nsIAppStartup.idl
+++ b/components/startup/public/nsIAppStartup.idl
diff --git a/toolkit/components/startup/public/nsIUserInfo.idl b/components/startup/public/nsIUserInfo.idl
index 1838cc69c..1838cc69c 100644
--- a/toolkit/components/startup/public/nsIUserInfo.idl
+++ b/components/startup/public/nsIUserInfo.idl
diff --git a/toolkit/components/statusfilter/moz.build b/components/statusfilter/moz.build
index 94b334c7a..94b334c7a 100644
--- a/toolkit/components/statusfilter/moz.build
+++ b/components/statusfilter/moz.build
diff --git a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp b/components/statusfilter/nsBrowserStatusFilter.cpp
index f607e01b4..f607e01b4 100644
--- a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
+++ b/components/statusfilter/nsBrowserStatusFilter.cpp
diff --git a/toolkit/components/statusfilter/nsBrowserStatusFilter.h b/components/statusfilter/nsBrowserStatusFilter.h
index 0eb6364fd..0eb6364fd 100644
--- a/toolkit/components/statusfilter/nsBrowserStatusFilter.h
+++ b/components/statusfilter/nsBrowserStatusFilter.h
diff --git a/toolkit/components/terminator/moz.build b/components/terminator/moz.build
index 59dcb1a09..59dcb1a09 100644
--- a/toolkit/components/terminator/moz.build
+++ b/components/terminator/moz.build
diff --git a/toolkit/components/terminator/nsTerminator.cpp b/components/terminator/nsTerminator.cpp
index 045703bb2..045703bb2 100644
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/components/terminator/nsTerminator.cpp
diff --git a/toolkit/components/terminator/nsTerminator.h b/components/terminator/nsTerminator.h
index de6da9532..de6da9532 100644
--- a/toolkit/components/terminator/nsTerminator.h
+++ b/components/terminator/nsTerminator.h
diff --git a/toolkit/components/terminator/terminator.manifest b/components/terminator/terminator.manifest
index 33cb143de..33cb143de 100644
--- a/toolkit/components/terminator/terminator.manifest
+++ b/components/terminator/terminator.manifest
diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/components/thumbnails/BackgroundPageThumbs.jsm
index 77b7c8e2c..77b7c8e2c 100644
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/components/thumbnails/BackgroundPageThumbs.jsm
diff --git a/toolkit/components/thumbnails/BrowserPageThumbs.manifest b/components/thumbnails/BrowserPageThumbs.manifest
index 8dfc0597b..8dfc0597b 100644
--- a/toolkit/components/thumbnails/BrowserPageThumbs.manifest
+++ b/components/thumbnails/BrowserPageThumbs.manifest
diff --git a/toolkit/components/thumbnails/PageThumbUtils.jsm b/components/thumbnails/PageThumbUtils.jsm
index f91b36480..f91b36480 100644
--- a/toolkit/components/thumbnails/PageThumbUtils.jsm
+++ b/components/thumbnails/PageThumbUtils.jsm
diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/components/thumbnails/PageThumbs.jsm
index 714bbbb77..714bbbb77 100644
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/components/thumbnails/PageThumbs.jsm
diff --git a/toolkit/components/thumbnails/PageThumbsProtocol.js b/components/thumbnails/PageThumbsProtocol.js
index 41dfe96be..41dfe96be 100644
--- a/toolkit/components/thumbnails/PageThumbsProtocol.js
+++ b/components/thumbnails/PageThumbsProtocol.js
diff --git a/toolkit/components/thumbnails/PageThumbsWorker.js b/components/thumbnails/PageThumbsWorker.js
index 83171c91f..83171c91f 100644
--- a/toolkit/components/thumbnails/PageThumbsWorker.js
+++ b/components/thumbnails/PageThumbsWorker.js
diff --git a/toolkit/components/thumbnails/blankthumb.inc b/components/thumbnails/blankthumb.inc
index 06577c19c..06577c19c 100644
--- a/toolkit/components/thumbnails/blankthumb.inc
+++ b/components/thumbnails/blankthumb.inc
diff --git a/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js b/components/thumbnails/content/backgroundPageThumbsContent.js
index ab39e73f7..ab39e73f7 100644
--- a/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js
+++ b/components/thumbnails/content/backgroundPageThumbsContent.js
diff --git a/toolkit/components/thumbnails/jar.mn b/components/thumbnails/jar.mn
index c83c64e48..c83c64e48 100644
--- a/toolkit/components/thumbnails/jar.mn
+++ b/components/thumbnails/jar.mn
diff --git a/toolkit/components/thumbnails/moz.build b/components/thumbnails/moz.build
index 957bc7df0..957bc7df0 100644
--- a/toolkit/components/thumbnails/moz.build
+++ b/components/thumbnails/moz.build
diff --git a/toolkit/components/timermanager/moz.build b/components/timermanager/moz.build
index c75945528..c75945528 100644
--- a/toolkit/components/timermanager/moz.build
+++ b/components/timermanager/moz.build
diff --git a/toolkit/components/timermanager/nsIUpdateTimerManager.idl b/components/timermanager/nsIUpdateTimerManager.idl
index 6f9e2d169..6f9e2d169 100644
--- a/toolkit/components/timermanager/nsIUpdateTimerManager.idl
+++ b/components/timermanager/nsIUpdateTimerManager.idl
diff --git a/toolkit/components/timermanager/nsUpdateTimerManager.js b/components/timermanager/nsUpdateTimerManager.js
index 3ba82f8c0..3ba82f8c0 100644
--- a/toolkit/components/timermanager/nsUpdateTimerManager.js
+++ b/components/timermanager/nsUpdateTimerManager.js
diff --git a/toolkit/components/timermanager/nsUpdateTimerManager.manifest b/components/timermanager/nsUpdateTimerManager.manifest
index 73cb11e35..73cb11e35 100644
--- a/toolkit/components/timermanager/nsUpdateTimerManager.manifest
+++ b/components/timermanager/nsUpdateTimerManager.manifest
diff --git a/toolkit/components/tooltiptext/TooltipTextProvider.js b/components/tooltiptext/TooltipTextProvider.js
index a63ab83ad..a63ab83ad 100644
--- a/toolkit/components/tooltiptext/TooltipTextProvider.js
+++ b/components/tooltiptext/TooltipTextProvider.js
diff --git a/toolkit/components/tooltiptext/TooltipTextProvider.manifest b/components/tooltiptext/TooltipTextProvider.manifest
index a7dac6cd9..a7dac6cd9 100644
--- a/toolkit/components/tooltiptext/TooltipTextProvider.manifest
+++ b/components/tooltiptext/TooltipTextProvider.manifest
diff --git a/toolkit/components/tooltiptext/moz.build b/components/tooltiptext/moz.build
index f3576c88f..f3576c88f 100644
--- a/toolkit/components/tooltiptext/moz.build
+++ b/components/tooltiptext/moz.build
diff --git a/toolkit/components/typeaheadfind/content/notfound.wav b/components/typeaheadfind/content/notfound.wav
index c6fd5cb86..c6fd5cb86 100644
--- a/toolkit/components/typeaheadfind/content/notfound.wav
+++ b/components/typeaheadfind/content/notfound.wav
diff --git a/toolkit/components/typeaheadfind/jar.mn b/components/typeaheadfind/jar.mn
index 173caf77a..173caf77a 100644
--- a/toolkit/components/typeaheadfind/jar.mn
+++ b/components/typeaheadfind/jar.mn
diff --git a/toolkit/components/typeaheadfind/moz.build b/components/typeaheadfind/moz.build
index e8fe4c9a8..e8fe4c9a8 100644
--- a/toolkit/components/typeaheadfind/moz.build
+++ b/components/typeaheadfind/moz.build
diff --git a/toolkit/components/typeaheadfind/nsITypeAheadFind.idl b/components/typeaheadfind/nsITypeAheadFind.idl
index 379d2c2a2..379d2c2a2 100644
--- a/toolkit/components/typeaheadfind/nsITypeAheadFind.idl
+++ b/components/typeaheadfind/nsITypeAheadFind.idl
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/components/typeaheadfind/nsTypeAheadFind.cpp
index 4690383ab..4690383ab 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/components/typeaheadfind/nsTypeAheadFind.cpp
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.h b/components/typeaheadfind/nsTypeAheadFind.h
index 8ff5ad1bf..8ff5ad1bf 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.h
+++ b/components/typeaheadfind/nsTypeAheadFind.h
diff --git a/toolkit/components/update/app/Launchd.plist b/components/update/app/Launchd.plist
index f0b5cef08..f0b5cef08 100644
--- a/toolkit/components/update/app/Launchd.plist
+++ b/components/update/app/Launchd.plist
diff --git a/toolkit/components/update/app/Makefile.in b/components/update/app/Makefile.in
index c1cfcead7..c1cfcead7 100644
--- a/toolkit/components/update/app/Makefile.in
+++ b/components/update/app/Makefile.in
diff --git a/toolkit/components/update/app/archivereader.cpp b/components/update/app/archivereader.cpp
index 90cf45c3d..90cf45c3d 100644
--- a/toolkit/components/update/app/archivereader.cpp
+++ b/components/update/app/archivereader.cpp
diff --git a/toolkit/components/update/app/archivereader.h b/components/update/app/archivereader.h
index a9d78aab1..a9d78aab1 100644
--- a/toolkit/components/update/app/archivereader.h
+++ b/components/update/app/archivereader.h
diff --git a/toolkit/components/update/app/bspatch.cpp b/components/update/app/bspatch.cpp
index e632fe3d3..e632fe3d3 100644
--- a/toolkit/components/update/app/bspatch.cpp
+++ b/components/update/app/bspatch.cpp
diff --git a/toolkit/components/update/app/bspatch.h b/components/update/app/bspatch.h
index c24c001cc..c24c001cc 100644
--- a/toolkit/components/update/app/bspatch.h
+++ b/components/update/app/bspatch.h
diff --git a/toolkit/components/update/app/dep1.der b/components/update/app/dep1.der
index 95b4ef38c..95b4ef38c 100644
--- a/toolkit/components/update/app/dep1.der
+++ b/components/update/app/dep1.der
diff --git a/toolkit/components/update/app/dep2.der b/components/update/app/dep2.der
index a460d6a16..a460d6a16 100644
--- a/toolkit/components/update/app/dep2.der
+++ b/components/update/app/dep2.der
diff --git a/toolkit/components/update/app/gen_cert_header.py b/components/update/app/gen_cert_header.py
index 7ecb15619..7ecb15619 100644
--- a/toolkit/components/update/app/gen_cert_header.py
+++ b/components/update/app/gen_cert_header.py
diff --git a/toolkit/components/update/app/loaddlls.cpp b/components/update/app/loaddlls.cpp
index b4291a5df..b4291a5df 100644
--- a/toolkit/components/update/app/loaddlls.cpp
+++ b/components/update/app/loaddlls.cpp
diff --git a/toolkit/components/update/app/module.ver b/components/update/app/module.ver
index 771416bb1..771416bb1 100644
--- a/toolkit/components/update/app/module.ver
+++ b/components/update/app/module.ver
diff --git a/toolkit/components/update/app/moz.build b/components/update/app/moz.build
index 73040a4cf..e2a229998 100644
--- a/toolkit/components/update/app/moz.build
+++ b/components/update/app/moz.build
@@ -71,7 +71,7 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-  '/toolkit/components/update/lib',
+  '/components/update/lib',
   '/xpcom/glue',
 ]
 
diff --git a/toolkit/components/update/app/nightly_aurora_level3_primary.der b/components/update/app/nightly_aurora_level3_primary.der
index b22124798..b22124798 100644
--- a/toolkit/components/update/app/nightly_aurora_level3_primary.der
+++ b/components/update/app/nightly_aurora_level3_primary.der
diff --git a/toolkit/components/update/app/nightly_aurora_level3_secondary.der b/components/update/app/nightly_aurora_level3_secondary.der
index 2dffbd02d..2dffbd02d 100644
--- a/toolkit/components/update/app/nightly_aurora_level3_secondary.der
+++ b/components/update/app/nightly_aurora_level3_secondary.der
diff --git a/toolkit/components/update/app/progressui.h b/components/update/app/progressui.h
index 6dc20e06b..6dc20e06b 100644
--- a/toolkit/components/update/app/progressui.h
+++ b/components/update/app/progressui.h
diff --git a/toolkit/components/update/app/progressui_gtk.cpp b/components/update/app/progressui_gtk.cpp
index 902bc5ac8..902bc5ac8 100644
--- a/toolkit/components/update/app/progressui_gtk.cpp
+++ b/components/update/app/progressui_gtk.cpp
diff --git a/toolkit/components/update/app/progressui_null.cpp b/components/update/app/progressui_null.cpp
index cb3ac6369..cb3ac6369 100644
--- a/toolkit/components/update/app/progressui_null.cpp
+++ b/components/update/app/progressui_null.cpp
diff --git a/toolkit/components/update/app/progressui_win.cpp b/components/update/app/progressui_win.cpp
index 89bd71e85..89bd71e85 100644
--- a/toolkit/components/update/app/progressui_win.cpp
+++ b/components/update/app/progressui_win.cpp
diff --git a/toolkit/components/update/app/release_primary.der b/components/update/app/release_primary.der
index 11417c35e..11417c35e 100644
--- a/toolkit/components/update/app/release_primary.der
+++ b/components/update/app/release_primary.der
diff --git a/toolkit/components/update/app/release_secondary.der b/components/update/app/release_secondary.der
index 16a7ef6d9..16a7ef6d9 100644
--- a/toolkit/components/update/app/release_secondary.der
+++ b/components/update/app/release_secondary.der
diff --git a/toolkit/components/update/app/resource.h b/components/update/app/resource.h
index 3cfa4efda..3cfa4efda 100644
--- a/toolkit/components/update/app/resource.h
+++ b/components/update/app/resource.h
diff --git a/toolkit/components/update/app/updater.cpp b/components/update/app/updater.cpp
index f31c16d45..f31c16d45 100644
--- a/toolkit/components/update/app/updater.cpp
+++ b/components/update/app/updater.cpp
diff --git a/toolkit/components/update/app/updater.exe.comctl32.manifest b/components/update/app/updater.exe.comctl32.manifest
index 6bb850199..6bb850199 100644
--- a/toolkit/components/update/app/updater.exe.comctl32.manifest
+++ b/components/update/app/updater.exe.comctl32.manifest
diff --git a/toolkit/components/update/app/updater.exe.manifest b/components/update/app/updater.exe.manifest
index 619b4abfe..619b4abfe 100644
--- a/toolkit/components/update/app/updater.exe.manifest
+++ b/components/update/app/updater.exe.manifest
diff --git a/toolkit/components/update/app/updater.ico b/components/update/app/updater.ico
index 48457029d..48457029d 100644
--- a/toolkit/components/update/app/updater.ico
+++ b/components/update/app/updater.ico
diff --git a/toolkit/components/update/app/updater.png b/components/update/app/updater.png
index 7b5e78907..7b5e78907 100644
--- a/toolkit/components/update/app/updater.png
+++ b/components/update/app/updater.png
diff --git a/toolkit/components/update/app/updater.rc b/components/update/app/updater.rc
index 7603eecb6..7603eecb6 100644
--- a/toolkit/components/update/app/updater.rc
+++ b/components/update/app/updater.rc
diff --git a/toolkit/components/update/app/win_dirent.cpp b/components/update/app/win_dirent.cpp
index b0807ba5e..b0807ba5e 100644
--- a/toolkit/components/update/app/win_dirent.cpp
+++ b/components/update/app/win_dirent.cpp
diff --git a/toolkit/components/update/app/xpcshellCertificate.der b/components/update/app/xpcshellCertificate.der
index 185b2dff4..185b2dff4 100644
--- a/toolkit/components/update/app/xpcshellCertificate.der
+++ b/components/update/app/xpcshellCertificate.der
diff --git a/toolkit/components/update/content/history.js b/components/update/content/history.js
index 809eee478..809eee478 100644
--- a/toolkit/components/update/content/history.js
+++ b/components/update/content/history.js
diff --git a/toolkit/components/update/content/history.xul b/components/update/content/history.xul
index 92a32b6ef..92a32b6ef 100644
--- a/toolkit/components/update/content/history.xul
+++ b/components/update/content/history.xul
diff --git a/toolkit/components/update/content/updates.css b/components/update/content/updates.css
index e83c3be03..e83c3be03 100644
--- a/toolkit/components/update/content/updates.css
+++ b/components/update/content/updates.css
diff --git a/toolkit/components/update/content/updates.js b/components/update/content/updates.js
index 3e05566f1..3e05566f1 100644
--- a/toolkit/components/update/content/updates.js
+++ b/components/update/content/updates.js
diff --git a/toolkit/components/update/content/updates.xml b/components/update/content/updates.xml
index 9e8d4e936..9e8d4e936 100644
--- a/toolkit/components/update/content/updates.xml
+++ b/components/update/content/updates.xml
diff --git a/toolkit/components/update/content/updates.xul b/components/update/content/updates.xul
index e4cdc7a49..e4cdc7a49 100644
--- a/toolkit/components/update/content/updates.xul
+++ b/components/update/content/updates.xul
diff --git a/toolkit/components/update/jar.mn b/components/update/jar.mn
index 9bb5d2d05..9bb5d2d05 100644
--- a/toolkit/components/update/jar.mn
+++ b/components/update/jar.mn
diff --git a/toolkit/components/update/lib/certificatecheck.cpp b/components/update/lib/certificatecheck.cpp
index afb2e7ee3..afb2e7ee3 100644
--- a/toolkit/components/update/lib/certificatecheck.cpp
+++ b/components/update/lib/certificatecheck.cpp
diff --git a/toolkit/components/update/lib/certificatecheck.h b/components/update/lib/certificatecheck.h
index 43a7c85b6..43a7c85b6 100644
--- a/toolkit/components/update/lib/certificatecheck.h
+++ b/components/update/lib/certificatecheck.h
diff --git a/toolkit/components/update/lib/errors.h b/components/update/lib/errors.h
index 846118d55..846118d55 100644
--- a/toolkit/components/update/lib/errors.h
+++ b/components/update/lib/errors.h
diff --git a/toolkit/components/update/lib/moz.build b/components/update/lib/moz.build
index 714472b7f..714472b7f 100644
--- a/toolkit/components/update/lib/moz.build
+++ b/components/update/lib/moz.build
diff --git a/toolkit/components/update/lib/pathhash.cpp b/components/update/lib/pathhash.cpp
index 89a004cde..89a004cde 100644
--- a/toolkit/components/update/lib/pathhash.cpp
+++ b/components/update/lib/pathhash.cpp
diff --git a/toolkit/components/update/lib/pathhash.h b/components/update/lib/pathhash.h
index a238317e1..a238317e1 100644
--- a/toolkit/components/update/lib/pathhash.h
+++ b/components/update/lib/pathhash.h
diff --git a/toolkit/components/update/lib/readstrings.cpp b/components/update/lib/readstrings.cpp
index 428c91c0b..428c91c0b 100644
--- a/toolkit/components/update/lib/readstrings.cpp
+++ b/components/update/lib/readstrings.cpp
diff --git a/toolkit/components/update/lib/readstrings.h b/components/update/lib/readstrings.h
index cd1909fc9..cd1909fc9 100644
--- a/toolkit/components/update/lib/readstrings.h
+++ b/components/update/lib/readstrings.h
diff --git a/toolkit/components/update/lib/registrycertificates.cpp b/components/update/lib/registrycertificates.cpp
index 1c9c44619..1c9c44619 100644
--- a/toolkit/components/update/lib/registrycertificates.cpp
+++ b/components/update/lib/registrycertificates.cpp
diff --git a/toolkit/components/update/lib/registrycertificates.h b/components/update/lib/registrycertificates.h
index 9f68d1a8d..9f68d1a8d 100644
--- a/toolkit/components/update/lib/registrycertificates.h
+++ b/components/update/lib/registrycertificates.h
diff --git a/toolkit/components/update/lib/uachelper.cpp b/components/update/lib/uachelper.cpp
index 11647aa72..11647aa72 100644
--- a/toolkit/components/update/lib/uachelper.cpp
+++ b/components/update/lib/uachelper.cpp
diff --git a/toolkit/components/update/lib/uachelper.h b/components/update/lib/uachelper.h
index 6481ff5b5..6481ff5b5 100644
--- a/toolkit/components/update/lib/uachelper.h
+++ b/components/update/lib/uachelper.h
diff --git a/toolkit/components/update/lib/updatecommon.cpp b/components/update/lib/updatecommon.cpp
index 17a57eae3..17a57eae3 100644
--- a/toolkit/components/update/lib/updatecommon.cpp
+++ b/components/update/lib/updatecommon.cpp
diff --git a/toolkit/components/update/lib/updatecommon.h b/components/update/lib/updatecommon.h
index 3055851d8..3055851d8 100644
--- a/toolkit/components/update/lib/updatecommon.h
+++ b/components/update/lib/updatecommon.h
diff --git a/toolkit/components/update/lib/updatedefines.h b/components/update/lib/updatedefines.h
index 0db182219..0db182219 100644
--- a/toolkit/components/update/lib/updatedefines.h
+++ b/components/update/lib/updatedefines.h
diff --git a/toolkit/components/update/lib/updatehelper.cpp b/components/update/lib/updatehelper.cpp
index afb89bacf..afb89bacf 100644
--- a/toolkit/components/update/lib/updatehelper.cpp
+++ b/components/update/lib/updatehelper.cpp
diff --git a/toolkit/components/update/lib/updatehelper.h b/components/update/lib/updatehelper.h
index 3f010df49..3f010df49 100644
--- a/toolkit/components/update/lib/updatehelper.h
+++ b/components/update/lib/updatehelper.h
diff --git a/toolkit/components/update/lib/win_dirent.h b/components/update/lib/win_dirent.h
index 28f5317ff..28f5317ff 100644
--- a/toolkit/components/update/lib/win_dirent.h
+++ b/components/update/lib/win_dirent.h
diff --git a/toolkit/components/update/locale/history.dtd b/components/update/locale/history.dtd
index 100509999..100509999 100644
--- a/toolkit/components/update/locale/history.dtd
+++ b/components/update/locale/history.dtd
diff --git a/toolkit/components/update/locale/updates.dtd b/components/update/locale/updates.dtd
index 1247776b4..1247776b4 100644
--- a/toolkit/components/update/locale/updates.dtd
+++ b/components/update/locale/updates.dtd
diff --git a/toolkit/components/update/locale/updates.properties b/components/update/locale/updates.properties
index dadf03c47..dadf03c47 100644
--- a/toolkit/components/update/locale/updates.properties
+++ b/components/update/locale/updates.properties
diff --git a/toolkit/components/update/moz.build b/components/update/moz.build
index cc374e360..cc374e360 100644
--- a/toolkit/components/update/moz.build
+++ b/components/update/moz.build
diff --git a/toolkit/components/update/nsUpdateService.manifest b/components/update/nsUpdateService.manifest
index 59dbf0b5a..59dbf0b5a 100644
--- a/toolkit/components/update/nsUpdateService.manifest
+++ b/components/update/nsUpdateService.manifest
diff --git a/toolkit/components/update/public/nsIUpdateService.idl b/components/update/public/nsIUpdateService.idl
index 817df5a67..817df5a67 100644
--- a/toolkit/components/update/public/nsIUpdateService.idl
+++ b/components/update/public/nsIUpdateService.idl
diff --git a/toolkit/components/update/src/nsUpdateService.js b/components/update/src/nsUpdateService.js
index 9bea453db..9bea453db 100644
--- a/toolkit/components/update/src/nsUpdateService.js
+++ b/components/update/src/nsUpdateService.js
diff --git a/toolkit/components/update/src/nsUpdateServiceStub.js b/components/update/src/nsUpdateServiceStub.js
index dbb841b84..dbb841b84 100644
--- a/toolkit/components/update/src/nsUpdateServiceStub.js
+++ b/components/update/src/nsUpdateServiceStub.js
diff --git a/toolkit/components/urlformatter/api_keys.in b/components/urlformatter/api_keys.in
index 0edbcf26a..0edbcf26a 100644
--- a/toolkit/components/urlformatter/api_keys.in
+++ b/components/urlformatter/api_keys.in
diff --git a/toolkit/components/urlformatter/moz.build b/components/urlformatter/moz.build
index 9fd996860..9fd996860 100644
--- a/toolkit/components/urlformatter/moz.build
+++ b/components/urlformatter/moz.build
diff --git a/toolkit/components/urlformatter/nsIURLFormatter.idl b/components/urlformatter/nsIURLFormatter.idl
index a4a549d57..a4a549d57 100644
--- a/toolkit/components/urlformatter/nsIURLFormatter.idl
+++ b/components/urlformatter/nsIURLFormatter.idl
diff --git a/toolkit/components/urlformatter/nsURLFormatter.js b/components/urlformatter/nsURLFormatter.js
index 8bb68bc45..8bb68bc45 100644
--- a/toolkit/components/urlformatter/nsURLFormatter.js
+++ b/components/urlformatter/nsURLFormatter.js
diff --git a/toolkit/components/urlformatter/nsURLFormatter.manifest b/components/urlformatter/nsURLFormatter.manifest
index 3f9123d73..3f9123d73 100644
--- a/toolkit/components/urlformatter/nsURLFormatter.manifest
+++ b/components/urlformatter/nsURLFormatter.manifest
diff --git a/toolkit/components/utils/moz.build b/components/utils/moz.build
index 6cfa7a5c7..6cfa7a5c7 100644
--- a/toolkit/components/utils/moz.build
+++ b/components/utils/moz.build
diff --git a/toolkit/components/utils/simpleServices.js b/components/utils/simpleServices.js
index 0b8dfe877..0b8dfe877 100644
--- a/toolkit/components/utils/simpleServices.js
+++ b/components/utils/simpleServices.js
diff --git a/toolkit/components/utils/utils.manifest b/components/utils/utils.manifest
index b2d30bd98..b2d30bd98 100644
--- a/toolkit/components/utils/utils.manifest
+++ b/components/utils/utils.manifest
diff --git a/toolkit/components/viewconfig/content/config.js b/components/viewconfig/content/config.js
index 562962894..562962894 100644
--- a/toolkit/components/viewconfig/content/config.js
+++ b/components/viewconfig/content/config.js
diff --git a/toolkit/components/viewconfig/content/config.xul b/components/viewconfig/content/config.xul
index 25ce39da5..25ce39da5 100644
--- a/toolkit/components/viewconfig/content/config.xul
+++ b/components/viewconfig/content/config.xul
diff --git a/toolkit/components/viewconfig/jar.mn b/components/viewconfig/jar.mn
index 372902d57..372902d57 100644
--- a/toolkit/components/viewconfig/jar.mn
+++ b/components/viewconfig/jar.mn
diff --git a/toolkit/components/viewconfig/moz.build b/components/viewconfig/moz.build
index 635fa39c9..635fa39c9 100644
--- a/toolkit/components/viewconfig/moz.build
+++ b/components/viewconfig/moz.build
diff --git a/toolkit/components/viewsource/ViewSourceBrowser.jsm b/components/viewsource/ViewSourceBrowser.jsm
index 0623e244a..0623e244a 100644
--- a/toolkit/components/viewsource/ViewSourceBrowser.jsm
+++ b/components/viewsource/ViewSourceBrowser.jsm
diff --git a/toolkit/components/viewsource/content/viewPartialSource.js b/components/viewsource/content/viewPartialSource.js
index 0b069344a..0b069344a 100644
--- a/toolkit/components/viewsource/content/viewPartialSource.js
+++ b/components/viewsource/content/viewPartialSource.js
diff --git a/toolkit/components/viewsource/content/viewPartialSource.xul b/components/viewsource/content/viewPartialSource.xul
index c51744fd2..c51744fd2 100644
--- a/toolkit/components/viewsource/content/viewPartialSource.xul
+++ b/components/viewsource/content/viewPartialSource.xul
diff --git a/toolkit/components/viewsource/content/viewSource-content.js b/components/viewsource/content/viewSource-content.js
index bad90febf..bad90febf 100644
--- a/toolkit/components/viewsource/content/viewSource-content.js
+++ b/components/viewsource/content/viewSource-content.js
diff --git a/toolkit/components/viewsource/content/viewSource.css b/components/viewsource/content/viewSource.css
index d03efcc8c..d03efcc8c 100644
--- a/toolkit/components/viewsource/content/viewSource.css
+++ b/components/viewsource/content/viewSource.css
diff --git a/toolkit/components/viewsource/content/viewSource.js b/components/viewsource/content/viewSource.js
index 234ffefc3..234ffefc3 100644
--- a/toolkit/components/viewsource/content/viewSource.js
+++ b/components/viewsource/content/viewSource.js
diff --git a/toolkit/components/viewsource/content/viewSource.xul b/components/viewsource/content/viewSource.xul
index 3ad45a9d9..3ad45a9d9 100644
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/components/viewsource/content/viewSource.xul
diff --git a/toolkit/components/viewsource/content/viewSourceUtils.js b/components/viewsource/content/viewSourceUtils.js
index 72f5dd787..72f5dd787 100644
--- a/toolkit/components/viewsource/content/viewSourceUtils.js
+++ b/components/viewsource/content/viewSourceUtils.js
diff --git a/toolkit/components/viewsource/jar.mn b/components/viewsource/jar.mn
index 33818ae0d..33818ae0d 100644
--- a/toolkit/components/viewsource/jar.mn
+++ b/components/viewsource/jar.mn
diff --git a/toolkit/components/viewsource/moz.build b/components/viewsource/moz.build
index d28658de4..d28658de4 100644
--- a/toolkit/components/viewsource/moz.build
+++ b/components/viewsource/moz.build
diff --git a/toolkit/components/workerloader/moz.build b/components/workerloader/moz.build
index 82b6a758c..82b6a758c 100644
--- a/toolkit/components/workerloader/moz.build
+++ b/components/workerloader/moz.build
diff --git a/toolkit/components/workerloader/require.js b/components/workerloader/require.js
index 223132f7e..223132f7e 100644
--- a/toolkit/components/workerloader/require.js
+++ b/components/workerloader/require.js
diff --git a/toolkit/components/xulstore/XULStore.js b/components/xulstore/XULStore.js
index 8b5bc1313..8b5bc1313 100644
--- a/toolkit/components/xulstore/XULStore.js
+++ b/components/xulstore/XULStore.js
diff --git a/toolkit/components/xulstore/XULStore.manifest b/components/xulstore/XULStore.manifest
index 249f0c447..249f0c447 100644
--- a/toolkit/components/xulstore/XULStore.manifest
+++ b/components/xulstore/XULStore.manifest
diff --git a/toolkit/components/xulstore/moz.build b/components/xulstore/moz.build
index 4e36d474a..4e36d474a 100644
--- a/toolkit/components/xulstore/moz.build
+++ b/components/xulstore/moz.build
diff --git a/toolkit/components/xulstore/nsIXULStore.idl b/components/xulstore/nsIXULStore.idl
index 57050b31b..57050b31b 100644
--- a/toolkit/components/xulstore/nsIXULStore.idl
+++ b/components/xulstore/nsIXULStore.idl
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index a2877faf7..e8123aa59 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -347,7 +347,7 @@ include text-svgglyphs/reftest.list
 # text-transform/
 include text-transform/reftest.list
 
-include ../../toolkit/components/global/content/tests/reftests/reftest.list
+include ../../components/global/content/tests/reftests/reftest.list
 
 # -moz-transform/
 include transform/reftest.list
diff --git a/libs/bsdiff/moz.build b/libs/bsdiff/moz.build
index 06a504f9c..72d3a9143 100644
--- a/libs/bsdiff/moz.build
+++ b/libs/bsdiff/moz.build
@@ -23,7 +23,7 @@ if CONFIG['HOST_OS_ARCH'] == 'WINNT':
     USE_STATIC_LIBS = True
 
 LOCAL_INCLUDES += [
-    '/toolkit/components/update/app',
+    '/components/update/app',
 ]
 
 HOST_CXXFLAGS += CONFIG['MOZ_BZ2_CFLAGS']
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 334975f02..9d7f7576c 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -10,144 +10,144 @@
 
 @AB_CD@.jar:
 % locale global @AB_CD@ %locale/@AB_CD@/global/
-  locale/@AB_CD@/global/about.dtd                                 (../components/global/locale/about.dtd)
-  locale/@AB_CD@/global/aboutAbout.dtd                            (../components/global/locale/aboutAbout.dtd)
-  locale/@AB_CD@/global/aboutReader.properties                    (../components/global/locale/aboutReader.properties)
-  locale/@AB_CD@/global/aboutRights.dtd                           (../components/global/locale/aboutRights.dtd)
-  locale/@AB_CD@/global/aboutNetworking.dtd                       (../components/global/locale/aboutNetworking.dtd)
-  locale/@AB_CD@/global/aboutProfiles.dtd                         (../components/global/locale/aboutProfiles.dtd)
-  locale/@AB_CD@/global/aboutProfiles.properties                  (../components/global/locale/aboutProfiles.properties)
-  locale/@AB_CD@/global/aboutServiceWorkers.dtd                   (../components/global/locale/aboutServiceWorkers.dtd)
-  locale/@AB_CD@/global/aboutServiceWorkers.properties            (../components/global/locale/aboutServiceWorkers.properties)
-  locale/@AB_CD@/global/aboutSupport.dtd                          (../components/global/locale/aboutSupport.dtd)
-  locale/@AB_CD@/global/aboutSupport.properties                   (../components/global/locale/aboutSupport.properties)
-  locale/@AB_CD@/global/aboutTelemetry.dtd                        (../components/global/locale/aboutTelemetry.dtd)
-  locale/@AB_CD@/global/aboutTelemetry.properties                 (../components/global/locale/aboutTelemetry.properties)
+  locale/@AB_CD@/global/about.dtd                                 (/components/global/locale/about.dtd)
+  locale/@AB_CD@/global/aboutAbout.dtd                            (/components/global/locale/aboutAbout.dtd)
+  locale/@AB_CD@/global/aboutReader.properties                    (/components/global/locale/aboutReader.properties)
+  locale/@AB_CD@/global/aboutRights.dtd                           (/components/global/locale/aboutRights.dtd)
+  locale/@AB_CD@/global/aboutNetworking.dtd                       (/components/global/locale/aboutNetworking.dtd)
+  locale/@AB_CD@/global/aboutProfiles.dtd                         (/components/global/locale/aboutProfiles.dtd)
+  locale/@AB_CD@/global/aboutProfiles.properties                  (/components/global/locale/aboutProfiles.properties)
+  locale/@AB_CD@/global/aboutServiceWorkers.dtd                   (/components/global/locale/aboutServiceWorkers.dtd)
+  locale/@AB_CD@/global/aboutServiceWorkers.properties            (/components/global/locale/aboutServiceWorkers.properties)
+  locale/@AB_CD@/global/aboutSupport.dtd                          (/components/global/locale/aboutSupport.dtd)
+  locale/@AB_CD@/global/aboutSupport.properties                   (/components/global/locale/aboutSupport.properties)
+  locale/@AB_CD@/global/aboutTelemetry.dtd                        (/components/global/locale/aboutTelemetry.dtd)
+  locale/@AB_CD@/global/aboutTelemetry.properties                 (/components/global/locale/aboutTelemetry.properties)
 #ifdef MOZ_WEBRTC
-  locale/@AB_CD@/global/aboutWebrtc.properties                    (../components/global/locale/aboutWebrtc.properties)
+  locale/@AB_CD@/global/aboutWebrtc.properties                    (/components/global/locale/aboutWebrtc.properties)
 #endif
-  locale/@AB_CD@/global/autocomplete.properties                   (../components/global/locale/autocomplete.properties)
-  locale/@AB_CD@/global/appPicker.dtd                             (../components/global/locale/appPicker.dtd)
+  locale/@AB_CD@/global/autocomplete.properties                   (/components/global/locale/autocomplete.properties)
+  locale/@AB_CD@/global/appPicker.dtd                             (/components/global/locale/appPicker.dtd)
   locale/@AB_CD@/global/brand.dtd                                 (generic/chrome/global/brand.dtd)
-  locale/@AB_CD@/global/browser.properties                        (../components/global/locale/browser.properties)
-  locale/@AB_CD@/global/charsetMenu.dtd                           (../components/global/locale/charsetMenu.dtd)
-  locale/@AB_CD@/global/charsetMenu.properties                    (../components/global/locale/charsetMenu.properties)
-  locale/@AB_CD@/global/commonDialog.dtd                          (../components/global/locale/commonDialog.dtd)
-  locale/@AB_CD@/global/commonDialogs.properties                  (../components/global/locale/commonDialogs.properties)
-  locale/@AB_CD@/global/config.dtd                                (../components/global/locale/config.dtd)
-  locale/@AB_CD@/global/config.properties                         (../components/global/locale/config.properties)
-  locale/@AB_CD@/global/contentAreaCommands.properties            (../components/global/locale/contentAreaCommands.properties)
-  locale/@AB_CD@/global/console.dtd                               (../components/global/locale/console.dtd)
-  locale/@AB_CD@/global/console.properties                        (../components/global/locale/console.properties)
-  locale/@AB_CD@/global/customizeToolbar.dtd                      (../components/global/locale/customizeToolbar.dtd)
-  locale/@AB_CD@/global/customizeToolbar.properties               (../components/global/locale/customizeToolbar.properties)
-  locale/@AB_CD@/global/datetimebox.dtd                           (../components/global/locale/datetimebox.dtd)
-  locale/@AB_CD@/global/datetimepicker.dtd                        (../components/global/locale/datetimepicker.dtd)
-  locale/@AB_CD@/global/dateFormat.properties                     (../components/global/locale/dateFormat.properties)
-  locale/@AB_CD@/global/dialogOverlay.dtd                         (../components/global/locale/dialogOverlay.dtd)
-  locale/@AB_CD@/global/editMenuOverlay.dtd                       (../components/global/locale/editMenuOverlay.dtd)
-  locale/@AB_CD@/global/extensions.properties                     (../components/global/locale/extensions.properties)
-  locale/@AB_CD@/global/fallbackMenubar.properties                (../components/global/locale/fallbackMenubar.properties)
-  locale/@AB_CD@/global/filefield.properties                      (../components/global/locale/filefield.properties)
+  locale/@AB_CD@/global/browser.properties                        (/components/global/locale/browser.properties)
+  locale/@AB_CD@/global/charsetMenu.dtd                           (/components/global/locale/charsetMenu.dtd)
+  locale/@AB_CD@/global/charsetMenu.properties                    (/components/global/locale/charsetMenu.properties)
+  locale/@AB_CD@/global/commonDialog.dtd                          (/components/global/locale/commonDialog.dtd)
+  locale/@AB_CD@/global/commonDialogs.properties                  (/components/global/locale/commonDialogs.properties)
+  locale/@AB_CD@/global/config.dtd                                (/components/global/locale/config.dtd)
+  locale/@AB_CD@/global/config.properties                         (/components/global/locale/config.properties)
+  locale/@AB_CD@/global/contentAreaCommands.properties            (/components/global/locale/contentAreaCommands.properties)
+  locale/@AB_CD@/global/console.dtd                               (/components/global/locale/console.dtd)
+  locale/@AB_CD@/global/console.properties                        (/components/global/locale/console.properties)
+  locale/@AB_CD@/global/customizeToolbar.dtd                      (/components/global/locale/customizeToolbar.dtd)
+  locale/@AB_CD@/global/customizeToolbar.properties               (/components/global/locale/customizeToolbar.properties)
+  locale/@AB_CD@/global/datetimebox.dtd                           (/components/global/locale/datetimebox.dtd)
+  locale/@AB_CD@/global/datetimepicker.dtd                        (/components/global/locale/datetimepicker.dtd)
+  locale/@AB_CD@/global/dateFormat.properties                     (/components/global/locale/dateFormat.properties)
+  locale/@AB_CD@/global/dialogOverlay.dtd                         (/components/global/locale/dialogOverlay.dtd)
+  locale/@AB_CD@/global/editMenuOverlay.dtd                       (/components/global/locale/editMenuOverlay.dtd)
+  locale/@AB_CD@/global/extensions.properties                     (/components/global/locale/extensions.properties)
+  locale/@AB_CD@/global/fallbackMenubar.properties                (/components/global/locale/fallbackMenubar.properties)
+  locale/@AB_CD@/global/filefield.properties                      (/components/global/locale/filefield.properties)
 #ifdef MOZ_GTK
-  locale/@AB_CD@/global/filepicker.dtd                            (../components/global/locale/filepicker.dtd)
+  locale/@AB_CD@/global/filepicker.dtd                            (/components/global/locale/filepicker.dtd)
 #endif
-  locale/@AB_CD@/global/filepicker.properties                     (../components/global/locale/filepicker.properties)
-  locale/@AB_CD@/global/findbar.dtd                               (../components/global/locale/findbar.dtd)
-  locale/@AB_CD@/global/findbar.properties                        (../components/global/locale/findbar.properties)
-  locale/@AB_CD@/global/finddialog.dtd                            (../components/global/locale/finddialog.dtd)
-  locale/@AB_CD@/global/finddialog.properties                     (../components/global/locale/finddialog.properties)
-  locale/@AB_CD@/global/globalKeys.dtd                            (../components/global/locale/globalKeys.dtd)
-  locale/@AB_CD@/global/headsUpDisplay.properties                 (../components/global/locale/headsUpDisplay.properties)
-  locale/@AB_CD@/global/intl.css                                  (../components/global/locale/intl.css)
-  locale/@AB_CD@/global/intl.properties                           (../components/global/locale/intl.properties)
-  locale/@AB_CD@/global/keys.properties                           (../components/global/locale/keys.properties)
-  locale/@AB_CD@/global/languageNames.properties                  (../components/global/locale/languageNames.properties)
-  locale/@AB_CD@/global/narrate.properties                        (../components/global/locale/narrate.properties)
-  locale/@AB_CD@/global/notification.dtd                          (../components/global/locale/notification.dtd)
-  locale/@AB_CD@/global/preferences.dtd                           (../components/global/locale/preferences.dtd)
-  locale/@AB_CD@/global/printdialog.dtd                           (../components/global/locale/printdialog.dtd)
-  locale/@AB_CD@/global/printjoboptions.dtd                       (../components/global/locale/printjoboptions.dtd)
-  locale/@AB_CD@/global/printPageSetup.dtd                        (../components/global/locale/printPageSetup.dtd)
-  locale/@AB_CD@/global/printPreview.dtd                          (../components/global/locale/printPreview.dtd)
-  locale/@AB_CD@/global/printPreviewProgress.dtd                  (../components/global/locale/printPreviewProgress.dtd)
-  locale/@AB_CD@/global/printdialog.properties                    (../components/global/locale/printdialog.properties)
-  locale/@AB_CD@/global/printProgress.dtd                         (../components/global/locale/printProgress.dtd)
-  locale/@AB_CD@/global/regionNames.properties                    (../components/global/locale/regionNames.properties)
-  locale/@AB_CD@/global/resetProfile.dtd                          (../components/global/locale/resetProfile.dtd)
-  locale/@AB_CD@/global/resetProfile.properties                   (../components/global/locale/resetProfile.properties)
-  locale/@AB_CD@/global/dialog.properties                         (../components/global/locale/dialog.properties)
-  locale/@AB_CD@/global/tree.dtd                                  (../components/global/locale/tree.dtd)
-  locale/@AB_CD@/global/textcontext.dtd                           (../components/global/locale/textcontext.dtd)
-  locale/@AB_CD@/global/videocontrols.dtd                         (../components/global/locale/videocontrols.dtd)
-  locale/@AB_CD@/global/viewSource.dtd                            (../components/global/locale/viewSource.dtd)
-  locale/@AB_CD@/global/viewSource.properties                     (../components/global/locale/viewSource.properties)
-  locale/@AB_CD@/global/wizard.dtd                                (../components/global/locale/wizard.dtd)
-  locale/@AB_CD@/global/wizard.properties                         (../components/global/locale/wizard.properties)
+  locale/@AB_CD@/global/filepicker.properties                     (/components/global/locale/filepicker.properties)
+  locale/@AB_CD@/global/findbar.dtd                               (/components/global/locale/findbar.dtd)
+  locale/@AB_CD@/global/findbar.properties                        (/components/global/locale/findbar.properties)
+  locale/@AB_CD@/global/finddialog.dtd                            (/components/global/locale/finddialog.dtd)
+  locale/@AB_CD@/global/finddialog.properties                     (/components/global/locale/finddialog.properties)
+  locale/@AB_CD@/global/globalKeys.dtd                            (/components/global/locale/globalKeys.dtd)
+  locale/@AB_CD@/global/headsUpDisplay.properties                 (/components/global/locale/headsUpDisplay.properties)
+  locale/@AB_CD@/global/intl.css                                  (/components/global/locale/intl.css)
+  locale/@AB_CD@/global/intl.properties                           (/components/global/locale/intl.properties)
+  locale/@AB_CD@/global/keys.properties                           (/components/global/locale/keys.properties)
+  locale/@AB_CD@/global/languageNames.properties                  (/components/global/locale/languageNames.properties)
+  locale/@AB_CD@/global/narrate.properties                        (/components/global/locale/narrate.properties)
+  locale/@AB_CD@/global/notification.dtd                          (/components/global/locale/notification.dtd)
+  locale/@AB_CD@/global/preferences.dtd                           (/components/global/locale/preferences.dtd)
+  locale/@AB_CD@/global/printdialog.dtd                           (/components/global/locale/printdialog.dtd)
+  locale/@AB_CD@/global/printjoboptions.dtd                       (/components/global/locale/printjoboptions.dtd)
+  locale/@AB_CD@/global/printPageSetup.dtd                        (/components/global/locale/printPageSetup.dtd)
+  locale/@AB_CD@/global/printPreview.dtd                          (/components/global/locale/printPreview.dtd)
+  locale/@AB_CD@/global/printPreviewProgress.dtd                  (/components/global/locale/printPreviewProgress.dtd)
+  locale/@AB_CD@/global/printdialog.properties                    (/components/global/locale/printdialog.properties)
+  locale/@AB_CD@/global/printProgress.dtd                         (/components/global/locale/printProgress.dtd)
+  locale/@AB_CD@/global/regionNames.properties                    (/components/global/locale/regionNames.properties)
+  locale/@AB_CD@/global/resetProfile.dtd                          (/components/global/locale/resetProfile.dtd)
+  locale/@AB_CD@/global/resetProfile.properties                   (/components/global/locale/resetProfile.properties)
+  locale/@AB_CD@/global/dialog.properties                         (/components/global/locale/dialog.properties)
+  locale/@AB_CD@/global/tree.dtd                                  (/components/global/locale/tree.dtd)
+  locale/@AB_CD@/global/textcontext.dtd                           (/components/global/locale/textcontext.dtd)
+  locale/@AB_CD@/global/videocontrols.dtd                         (/components/global/locale/videocontrols.dtd)
+  locale/@AB_CD@/global/viewSource.dtd                            (/components/global/locale/viewSource.dtd)
+  locale/@AB_CD@/global/viewSource.properties                     (/components/global/locale/viewSource.properties)
+  locale/@AB_CD@/global/wizard.dtd                                (/components/global/locale/wizard.dtd)
+  locale/@AB_CD@/global/wizard.properties                         (/components/global/locale/wizard.properties)
   locale/@AB_CD@/global/crashes.dtd                               (%crashreporter/crashes.dtd)
   locale/@AB_CD@/global/crashes.properties                        (%crashreporter/crashes.properties)
 
 % locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/
-  locale/@AB_CD@/global-platform/unix/intl.properties             (../components/global/locale/unix/intl.properties)
-  locale/@AB_CD@/global-platform/unix/platformKeys.properties     (../components/global/locale/unix/platformKeys.properties)
-  locale/@AB_CD@/global-platform/win/intl.properties              (../components/global/locale/win/intl.properties)
-  locale/@AB_CD@/global-platform/win/platformKeys.properties      (../components/global/locale/win/platformKeys.properties)
+  locale/@AB_CD@/global-platform/unix/intl.properties             (/components/global/locale/unix/intl.properties)
+  locale/@AB_CD@/global-platform/unix/platformKeys.properties     (/components/global/locale/unix/platformKeys.properties)
+  locale/@AB_CD@/global-platform/win/intl.properties              (/components/global/locale/win/intl.properties)
+  locale/@AB_CD@/global-platform/win/platformKeys.properties      (/components/global/locale/win/platformKeys.properties)
 
 % locale mozapps @AB_CD@ %locale/@AB_CD@/mozapps/
-  locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (../components/downloads/locale/unknownContentType.properties)
-  locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (../components/downloads/locale/unknownContentType.dtd)
-  locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (../components/downloads/locale/settingsChange.dtd)
-  locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (../components/downloads/locale/downloads.dtd)
-  locale/@AB_CD@/mozapps/downloads/downloads.properties           (../components/downloads/locale/downloads.properties)
-  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (../components/extensions/locale/extensions.dtd)
-  locale/@AB_CD@/mozapps/extensions/extensions.properties         (../components/extensions/locale/extensions.properties)
-  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (../components/extensions/locale/blocklist.dtd)
-  locale/@AB_CD@/mozapps/extensions/about.dtd                     (../components/extensions/locale/about.dtd)
-  locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (../components/extensions/locale/selectAddons.dtd)
-  locale/@AB_CD@/mozapps/extensions/selectAddons.properties       (../components/extensions/locale/selectAddons.properties)
-  locale/@AB_CD@/mozapps/extensions/update.dtd                    (../components/extensions/locale/update.dtd)
-  locale/@AB_CD@/mozapps/extensions/update.properties             (../components/extensions/locale/update.properties)
-  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (../components/extensions/locale/newaddon.dtd)
-  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (../components/extensions/locale/newaddon.properties)
-  locale/@AB_CD@/mozapps/handling/handling.dtd                    (../components/handling/locale/handling.dtd)
-  locale/@AB_CD@/mozapps/handling/handling.properties             (../components/handling/locale/handling.properties)
-  locale/@AB_CD@/mozapps/preferences/changemp.dtd                 (../components/preferences/locale/changemp.dtd)
-  locale/@AB_CD@/mozapps/preferences/removemp.dtd                 (../components/preferences/locale/removemp.dtd)
-  locale/@AB_CD@/mozapps/preferences/preferences.properties       (../components/preferences/locale/preferences.properties)
-  locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd          (../components/profile/locale/createProfileWizard.dtd)
-  locale/@AB_CD@/mozapps/profile/profileSelection.properties      (../components/profile/locale/profileSelection.properties)
-  locale/@AB_CD@/mozapps/profile/profileSelection.dtd             (../components/profile/locale/profileSelection.dtd)
-  locale/@AB_CD@/mozapps/update/updates.dtd                       (../components/update/locale/updates.dtd)
-  locale/@AB_CD@/mozapps/update/updates.properties                (../components/update/locale/updates.properties)
-  locale/@AB_CD@/mozapps/update/history.dtd                       (../components/update/locale/history.dtd)
-  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (../components/extensions/locale/xpinstallConfirm.dtd)
-  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (../components/extensions/locale/xpinstallConfirm.properties)
+  locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (/components/downloads/locale/unknownContentType.properties)
+  locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (/components/downloads/locale/unknownContentType.dtd)
+  locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (/components/downloads/locale/settingsChange.dtd)
+  locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (/components/downloads/locale/downloads.dtd)
+  locale/@AB_CD@/mozapps/downloads/downloads.properties           (/components/downloads/locale/downloads.properties)
+  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (/components/extensions/locale/extensions.dtd)
+  locale/@AB_CD@/mozapps/extensions/extensions.properties         (/components/extensions/locale/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (/components/extensions/locale/blocklist.dtd)
+  locale/@AB_CD@/mozapps/extensions/about.dtd                     (/components/extensions/locale/about.dtd)
+  locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (/components/extensions/locale/selectAddons.dtd)
+  locale/@AB_CD@/mozapps/extensions/selectAddons.properties       (/components/extensions/locale/selectAddons.properties)
+  locale/@AB_CD@/mozapps/extensions/update.dtd                    (/components/extensions/locale/update.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.properties             (/components/extensions/locale/update.properties)
+  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (/components/extensions/locale/newaddon.dtd)
+  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (/components/extensions/locale/newaddon.properties)
+  locale/@AB_CD@/mozapps/handling/handling.dtd                    (/components/handling/locale/handling.dtd)
+  locale/@AB_CD@/mozapps/handling/handling.properties             (/components/handling/locale/handling.properties)
+  locale/@AB_CD@/mozapps/preferences/changemp.dtd                 (/components/preferences/locale/changemp.dtd)
+  locale/@AB_CD@/mozapps/preferences/removemp.dtd                 (/components/preferences/locale/removemp.dtd)
+  locale/@AB_CD@/mozapps/preferences/preferences.properties       (/components/preferences/locale/preferences.properties)
+  locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd          (/components/profile/locale/createProfileWizard.dtd)
+  locale/@AB_CD@/mozapps/profile/profileSelection.properties      (/components/profile/locale/profileSelection.properties)
+  locale/@AB_CD@/mozapps/profile/profileSelection.dtd             (/components/profile/locale/profileSelection.dtd)
+  locale/@AB_CD@/mozapps/update/updates.dtd                       (/components/update/locale/updates.dtd)
+  locale/@AB_CD@/mozapps/update/updates.properties                (/components/update/locale/updates.properties)
+  locale/@AB_CD@/mozapps/update/history.dtd                       (/components/update/locale/history.dtd)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (/components/extensions/locale/xpinstallConfirm.dtd)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (/components/extensions/locale/xpinstallConfirm.properties)
 
 % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
-  locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (../components/pluginproblem/locale/pluginproblem.dtd)
+  locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (/components/pluginproblem/locale/pluginproblem.dtd)
 
 % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
-  locale/@AB_CD@/alerts/alert.dtd                                 (../components/alerts/locale/alert.dtd)
-  locale/@AB_CD@/alerts/alert.properties                          (../components/alerts/locale/alert.properties)
+  locale/@AB_CD@/alerts/alert.dtd                                 (/components/alerts/locale/alert.dtd)
+  locale/@AB_CD@/alerts/alert.properties                          (/components/alerts/locale/alert.properties)
 
 % locale cookie @AB_CD@ %locale/@AB_CD@/cookie/
-  locale/@AB_CD@/cookie/cookieAcceptDialog.dtd                    (../components/cookie/locale/cookieAcceptDialog.dtd)
-  locale/@AB_CD@/cookie/cookieAcceptDialog.properties             (../components/cookie/locale/cookieAcceptDialog.properties)
+  locale/@AB_CD@/cookie/cookieAcceptDialog.dtd                    (/components/cookie/locale/cookieAcceptDialog.dtd)
+  locale/@AB_CD@/cookie/cookieAcceptDialog.properties             (/components/cookie/locale/cookieAcceptDialog.properties)
 
 % locale formautofill @AB_CD@ %locale/@AB_CD@/formautofill/
-  locale/@AB_CD@/formautofill/requestAutocomplete.dtd             (../components/formautofill/locale/requestAutocomplete.dtd)
+  locale/@AB_CD@/formautofill/requestAutocomplete.dtd             (/components/formautofill/locale/requestAutocomplete.dtd)
 
 % locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/
-  locale/@AB_CD@/passwordmgr/passwordmgr.properties               (../components/passwordmgr/locale/passwordmgr.properties)
-  locale/@AB_CD@/passwordmgr/passwordManager.dtd                  (../components/passwordmgr/locale/passwordManager.dtd)
+  locale/@AB_CD@/passwordmgr/passwordmgr.properties               (/components/passwordmgr/locale/passwordmgr.properties)
+  locale/@AB_CD@/passwordmgr/passwordManager.dtd                  (/components/passwordmgr/locale/passwordManager.dtd)
 
 % locale autoconfig @AB_CD@ %locale/@AB_CD@/autoconfig/
-  locale/@AB_CD@/autoconfig/autoconfig.properties                 (../components/global/locale/autoconfig.properties)
+  locale/@AB_CD@/autoconfig/autoconfig.properties                 (/components/global/locale/autoconfig.properties)
 
 % locale places @AB_CD@ %locale/@AB_CD@/places/
-  locale/@AB_CD@/places/places.properties                         (../components/places/locale/places.properties)
+  locale/@AB_CD@/places/places.properties                         (/components/places/locale/places.properties)
 
 # Even though Basilisk has its own private copy of the search service
 # we can't have a global l10n resource there because of DIST_SUBDIR so just
 # package the file unconditionally.
-  locale/@AB_CD@/global/search/search.properties                  (../components/search/locale/search.properties)
+  locale/@AB_CD@/global/search/search.properties                  (/components/search/locale/search.properties)
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 96a0136fb..b464cff11 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
-    'components',
     'fonts',
     'locales',
     'modules',
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 88a47d928..a26235249 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -97,6 +97,7 @@ DIRS += [
     '/tools/power',
     '/tools/profiler',
     '/tools/memory-profiler',
+    '/components',
     '/xpfe/components',
 ]
 
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index cc1cef2d8..762df91da 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -104,11 +104,11 @@ if CONFIG['MOZ_PHOENIX']:
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 LOCAL_INCLUDES += [
+    '/components/profile',
     '/config',
     '/dom/base',
     '/dom/ipc',
     '/testing/gtest/mozilla',
-    '/toolkit/components/profile',
     '/xpcom/build',
 ]