CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Nov 16 01:04:38 UTC 2017

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-build_moz.configure_memory.configure
            patch-toolkit_moz.configure
Removed Files:
        pkgsrc/www/firefox/patches: patch-layout_style_ServoBindingList.h
            patch-layout_style_ServoBindingTypes.h
            patch-layout_style_ServoBindings.h
            patch-layout_style_ServoBindings.toml
            patch-media_libcubeb_src_cubeb__jack.cpp patch-servo_Cargo.lock
            patch-servo_components_devtools_lib.rs
            patch-servo_components_layout_animation.rs
            patch-servo_components_layout_construct.rs
            patch-servo_components_layout_display__list__builder.rs
            patch-servo_components_layout_flex.rs
            patch-servo_components_layout_inline.rs
            patch-servo_components_layout_sequential.rs
            patch-servo_components_layout_table__cell.rs
            patch-servo_components_layout_text.rs
            patch-servo_components_net_cookie__storage.rs
            patch-servo_components_profile_heartbeats.rs
            patch-servo_components_script__plugins_unrooted__must__root.rs
            patch-servo_components_script_dom_bindings_js.rs
            patch-servo_components_script_dom_cssstyledeclaration.rs
            patch-servo_components_script_dom_cssstylerule.rs
            patch-servo_components_script_dom_document.rs
            patch-servo_components_script_dom_medialist.rs
            patch-servo_components_script_dom_range.rs
            patch-servo_components_script_dom_servoparser_async__html.rs
            patch-servo_components_script_dom_url.rs
            patch-servo_components_script_dom_vrdisplay.rs
            patch-servo_components_script_dom_webglrenderingcontext.rs
            patch-servo_components_script_dom_xmlhttprequest.rs
            patch-servo_components_script_lib.rs
            patch-servo_components_selectors_matching.rs
            patch-servo_components_selectors_parser.rs
            patch-servo_components_style_gecko__bindings_sugar_ns__t__array.rs
            patch-servo_components_style_gecko_conversions.rs
            patch-servo_components_style_gecko_generated_bindings.rs
            patch-servo_components_style_gecko_wrapper.rs
            patch-servo_components_style_invalidation_element_invalidator.rs
            patch-servo_components_style_matching.rs
            patch-servo_components_style_properties_gecko.mako.rs
            patch-servo_components_style_properties_properties.mako.rs
            patch-servo_components_style_style__adjuster.rs
            patch-servo_components_style_style__resolver.rs
            patch-servo_components_style_stylesheets_rule__list.rs
            patch-servo_components_style_stylesheets_rule__parser.rs
            patch-servo_components_style_stylesheets_rules__iterator.rs
            patch-servo_components_style_values_specified_image.rs
            patch-servo_components_webdriver__server_lib.rs
            patch-servo_ports_geckolib_glue.rs patch-servo_rust-commit-hash
            patch-servo_tests_unit_style_stylist.rs

Log Message:
Update to 57.0

Changelog:  New
    A completely new browsing engine, designed to take full advantage
    of the processing power in modern devices

    A redesigned interface with a clean, modern appearance, consistent
    visual elements, and optimizations for touch screens

    A unified address and search bar. New installs will see this
    unified bar. Learn how to add the stand-alone search bar to
    the toolbar

    A revamped new tab page that includes top visited sites, recently
    visited pages, and recommendations from Pocket (in the US,
    Canada, and Germany)

    An updated product tour to orient new and returning Firefox
    users

    AMD VP9 hardware video decoder support for improved video
    playback with lower power consumption

    An expanded section in preferences to manage all website
    permissions

Fixed
    Various security fixes

Changed
    Firefox now exclusively supports extensions built using the
    WebExtension API, and unsupported legacy extensions will no
    longer work. Learn more about our efforts to improve the
    performance and security of extensions

    The browser's autoscroll feature, as well as scrolling by
    keyboard input and touch-dragging of scrollbars, now use
    asynchronous scrolling. These scrolling methods are now similar
    to other input methods like mousewheel, and provide a smoother
    scrolling experience

    The content process now has a stricter security sandbox that
    blocks filesystem reading and writing on Linux, similar to the
    protections for Windows and macOS that shipped in Firefox 56

    Middle mouse paste in the content area no longer navigates to
    URLs by default on Unix systems

    Removed the toolbar Share button. If you relied on this feature,
    you can install the Share Backported extension instead.

    Some older versions of the ATOK IME, including ATOK 2006, 2008,
    2009 and 2010, can cause crashes and are therefore disabled on
    the Windows 64-bit version of Firefox Quantum. To fix those
    incompatibility issues, please use a newer version of ATOK or
    one of other IMEs.

    The default font for Japanese text is now Meiryo

Security fixes:

CVE-2017-7828: Use-after-free of PressShell while restyling layout

Reporter
    Nils
Impact
    critical

Description

A use-after-free vulnerability can occur when flushing and resizing
layout because the PressShell object has been freed while still in
use. This results in a potentially exploitable crash during these
operations.

References
    Bug 1406750 Bug 1412252

#CVE-2017-7830: Cross-origin URL information leak through Resource
Timing API

Reporter
    Jun Kokatsu
Impact
    high

Description

The Resource Timing API incorrectly revealed navigations in
cross-origin iframes. This is a same-origin policy violation and
could allow for data theft of URLs loaded by users.

References
    Bug 1408990

#CVE-2017-7831: Information disclosure of exposed properties on
JavaScript proxy objects

Reporter
    Oriol Brufau
Impact
    moderate

Description

A vulnerability where the security wrapper does not deny access to
some exposed properties using the deprecated exposedProps mechanism
on proxy objects. These properties should be explicitly unavailable
to proxy objects.

References
    Bug 1392026

#CVE-2017-7832: Domain spoofing through use of dotless 'i' character
followed by accent markers

Reporter
    Jonathan Kew
Impact
    moderate

Description

The combined, single character, version of the letter 'i' with any
of the potential accents in unicode, such as acute or grave, can
be spoofed in the addressbar by the dotless version of 'i' followed
by the same accent as a second character with most font sets. This
allows for domain spoofing attacks because these combined domain
names do not display as punycode.

References
    Bug 1408782

#CVE-2017-7833: Domain spoofing with Arabic and Indic vowel marker
characters

Reporter
    Rayyan Bijoora
Impact
    moderate

Description

Some Arabic and Indic vowel marker characters can be combined with
Latin characters in a domain name to eclipse the non-Latin character
with some font sets on the addressbar. The non-Latin character will
not be visible to most viewers. This allows for domain spoofing
attacks because these combined domain names do not display as
punycode.

References
    Bug 1370497

#CVE-2017-7834: data: URLs opened in new tabs bypass CSP protections

Reporter
    Jordi Chancel
Impact
    moderate

Description

A data: URL loaded in a new tab did not inherit the Content Security
Policy (CSP) of the original page, allowing for bypasses of the
policy including the execution of JavaScript. In prior versions
when data: documents also inherited the context of the original
page this would allow for potential cross-site scripting (XSS)
attacks.

References
    Bug 1358009

#CVE-2017-7835: Mixed content blocking incorrectly applies with
redirects

Reporter
    Ben Kelly
Impact
    moderate

Description

Mixed content blocking of insecure (HTTP) sub-resources in a secure
(HTTPS) document was not correctly applied for resources that
redirect from HTTPS to HTTP, allowing content that should be blocked,
such as scripts, to be loaded on a page.

References
    Bug 1402363

#CVE-2017-7836: Pingsender dynamically loads libcurl on Linux and
OS X

Reporter
    Ezra Caltum
Impact
    moderate

Description

The "pingsender" executable used by the Firefox Health Report
dynamically loads a system copy of libcurl, which an attacker could
replace. This allows for privilege escalation as the replaced
libcurl code will run with Firefox's privileges.  Note: This attack
requires an attacker have local system access and only affects OS
X and Linux. Windows systems are not affected.

References
    Bug 1401339

#CVE-2017-7837: SVG loaded as <img> can use meta tags to set cookies

Reporter
    Jun Kokatsu
Impact
    moderate

Description

SVG loaded through <img> tags can use <meta> tags within the SVG
data to set cookies for that page.

References
    Bug 1325923

#CVE-2017-7838: Failure of individual decoding of labels in
international domain names triggers punycode display of entire IDN

Reporter
    Corey Bonnell
Impact
    low

Description

Punycode format text will be displayed for entire qualified
international domain names in some instances when a sub-domain
triggers the punycode display instead of the primary domain being
displayed in native script and the sub-domain only displaying as
punycode. This could be used for limited spoofing attacks due to
user confusion.

References
    Bug 1399540

#CVE-2017-7839: Control characters before javascript: URLs defeats
self-XSS prevention mechanism

Reporter
    Eric Lawrence
Impact
    low

Description

Control characters prepended before javascript: URLs pasted in the
addressbar can cause the leading characters to be ignored and the
pasted JavaScript to be executed instead of being blocked. This
could be used in social engineering and self-cross-site-scripting
(self-XSS) attacks where users are convinced to copy and paste text
into the addressbar.

References
    Bug 1402896

#CVE-2017-7840: Exported bookmarks do not strip script elements
from user-supplied tags

Reporter
    Hanno Bock
Impact
    low

Description

JavaScript can be injected into an exported bookmarks file by
placing JavaScript code into user-supplied tags in saved bookmarks.
If the resulting exported HTML file is later opened in a browser
this JavaScript will be executed. This could be used in social
engineering and self-cross-scripting (self-XSS) attacks if users
were convinced to add malicious tags to bookmarks, export them,
and then open the resulting file.

References
    Bug 1366420

#CVE-2017-7842: Referrer Policy is not always respected for <link>
elements

Reporter
    Jun Kokatsu
Impact
    low

Description

If a document's Referrer Policy attribute is set to "no-referrer"
sometimes two network requests are made for <link> elements
instead of one. One of these requests includes the referrer instead
of respecting the set policy to not include a referrer on requests.

References
    Bug 1397064

#CVE-2017-7827: Memory safety bugs fixed in Firefox 57

Reporter
    Mozilla developers and community
Impact
    critical

Description

Mozilla developers and community members Boris Zbarsky, Carsten Book,
Christian Holler, Byron Campen, Jan de Mooij, Jason Kratzer,
Jesse Schwartzentruber, Marcia Knous, Randell Jesup, Tyson Smith,
and Ting-Yu Chou reported memory safety bugs present in Firefox 56.
Some of these bugs showed evidence of memory corruption and we presume
that with enough effort that some of these could be exploited to run
arbitrary code.

References
    Memory safety bugs fixed in Firefox 57

#CVE-2017-7826: Memory safety bugs fixed in Firefox 57 and Firefox
ESR 52.5

Reporter
    Mozilla developers and community
Impact
    critical

Description

Mozilla developers and community members Christian Holler, David
Keeler, Jon Coppeard, Julien Cristau, Jan de Mooij, Jason Kratzer,
Philipp, Nicholas Nethercote, Oriol Brufau, André Bargull, Bob
Clary, Jet Villegas, Randell Jesup, Tyson Smith, Gary Kwong, and
Ryan VanderMeulen reported memory safety bugs present in Firefox
56 and Firefox ESR 52.4. Some of these bugs showed evidence of
memory corruption and we presume that with enough effort that some
of these could be exploited to run arbitrary code.

References
    Memory safety bugs fixed in Firefox 57 and Firefox ESR 52.5


To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.300 -r1.301 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.100 -r1.101 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-layout_style_ServoBindingList.h \
    pkgsrc/www/firefox/patches/patch-layout_style_ServoBindingTypes.h \
    pkgsrc/www/firefox/patches/patch-layout_style_ServoBindings.h \
    pkgsrc/www/firefox/patches/patch-layout_style_ServoBindings.toml \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__jack.cpp \
    pkgsrc/www/firefox/patches/patch-servo_Cargo.lock \
    pkgsrc/www/firefox/patches/patch-servo_components_devtools_lib.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_animation.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_construct.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_display__list__builder.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_flex.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_inline.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_sequential.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_table__cell.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_layout_text.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_net_cookie__storage.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_profile_heartbeats.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script__plugins_unrooted__must__root.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_bindings_js.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_cssstyledeclaration.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_cssstylerule.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_document.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_medialist.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_range.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_servoparser_async__html.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_url.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_vrdisplay.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_webglrenderingcontext.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_xmlhttprequest.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_lib.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_selectors_matching.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_selectors_parser.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko__bindings_sugar_ns__t__array.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko_conversions.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko_generated_bindings.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko_wrapper.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_invalidation_element_invalidator.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_matching.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_properties_gecko.mako.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_properties_properties.mako.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_style__adjuster.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_style__resolver.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_stylesheets_rule__list.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_stylesheets_rule__parser.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_stylesheets_rules__iterator.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_image.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_webdriver__server_lib.rs \
    pkgsrc/www/firefox/patches/patch-servo_ports_geckolib_glue.rs \
    pkgsrc/www/firefox/patches/patch-servo_rust-commit-hash \
    pkgsrc/www/firefox/patches/patch-servo_tests_unit_style_stylist.rs
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/firefox/patches/patch-toolkit_moz.configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.310 pkgsrc/www/firefox/Makefile:1.311
--- pkgsrc/www/firefox/Makefile:1.310   Fri Nov  3 22:07:27 2017
+++ pkgsrc/www/firefox/Makefile Thu Nov 16 01:04:38 2017
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.310 2017/11/03 22:07:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.311 2017/11/16 01:04:38 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            56.0
-MOZ_BRANCH_MINOR=      .2
+MOZ_BRANCH=            57.0
+MOZ_BRANCH_MINOR=      
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.124 pkgsrc/www/firefox/PLIST:1.125
--- pkgsrc/www/firefox/PLIST:1.124      Tue Oct 17 03:39:04 2017
+++ pkgsrc/www/firefox/PLIST    Thu Nov 16 01:04:38 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.124 2017/10/17 03:39:04 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.125 2017/11/16 01:04:38 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -15,6 +15,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/branding/icon48.png
 lib/firefox/browser/chrome/browser/content/branding/icon64.png
 lib/firefox/browser/chrome/browser/content/branding/identity-icons-brand.svg
+lib/firefox/browser/chrome/browser/content/briefcase.svg
 lib/firefox/browser/chrome/browser/content/browser/aboutDialog-appUpdater.js
 lib/firefox/browser/chrome/browser/content/browser/aboutDialog.css
 lib/firefox/browser/chrome/browser/content/browser/aboutDialog.js
@@ -23,13 +24,11 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.css
 lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.js
 lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml
-lib/firefox/browser/chrome/browser/content/browser/aboutProviderDirectory.xhtml
 lib/firefox/browser/chrome/browser/content/browser/aboutRobots-icon.png
 lib/firefox/browser/chrome/browser/content/browser/aboutRobots-widget-left.png
 lib/firefox/browser/chrome/browser/content/browser/aboutRobots.xhtml
 lib/firefox/browser/chrome/browser/content/browser/aboutSessionRestore.js
 lib/firefox/browser/chrome/browser/content/browser/aboutSessionRestore.xhtml
-lib/firefox/browser/chrome/browser/content/browser/aboutSocialError.xhtml
 lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.css
 lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.js
 lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.xhtml
@@ -53,7 +52,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/abouthome/downloads%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/browser/abouthome/history.png
 lib/firefox/browser/chrome/browser/content/browser/abouthome/history%2x.png@localhost
-lib/firefox/browser/chrome/browser/content/browser/abouthome/mozilla.svg
 lib/firefox/browser/chrome/browser/content/browser/abouthome/restore-large.png
 lib/firefox/browser/chrome/browser/content/browser/abouthome/restore-large%2x.png@localhost
 lib/firefox/browser/chrome/browser/content/browser/abouthome/restore.png
@@ -77,6 +75,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/browser-ctrlTab.js
 lib/firefox/browser/chrome/browser/content/browser/browser-customization.js
 lib/firefox/browser/chrome/browser/content/browser/browser-data-submission-info-bar.js
+lib/firefox/browser/chrome/browser/content/browser/browser-development-helpers.js
 lib/firefox/browser/chrome/browser/content/browser/browser-feeds.js
 lib/firefox/browser/chrome/browser/content/browser/browser-fullScreenAndPointerLock.js
 lib/firefox/browser/chrome/browser/content/browser/browser-fullZoom.js
@@ -87,7 +86,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/browser-plugins.js
 lib/firefox/browser/chrome/browser/content/browser/browser-safebrowsing.js
 lib/firefox/browser/chrome/browser/content/browser/browser-sidebar.js
-lib/firefox/browser/chrome/browser/content/browser/browser-social.js
 lib/firefox/browser/chrome/browser/content/browser/browser-sync.js
 lib/firefox/browser/chrome/browser/content/browser/browser-tabPreviews.xml
 lib/firefox/browser/chrome/browser/content/browser/browser-tabsintitlebar.js
@@ -96,6 +94,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/browser.css
 lib/firefox/browser/chrome/browser/content/browser/browser.js
 lib/firefox/browser/chrome/browser/content/browser/browser.xul
+lib/firefox/browser/chrome/browser/content/browser/built_in_addons.json
 lib/firefox/browser/chrome/browser/content/browser/content-UITour.js
 lib/firefox/browser/chrome/browser/content/browser/content-sessionStore.js
 lib/firefox/browser/chrome/browser/content/browser/content.js
@@ -122,8 +121,8 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.icon.jpg
 lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg
 lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compact.header.png
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compactdark.icon.svg
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compactlight.icon.svg
+lib/firefox/browser/chrome/browser/content/browser/defaultthemes/dark.icon.svg
+lib/firefox/browser/chrome/browser/content/browser/defaultthemes/light.icon.svg
 lib/firefox/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.js
 lib/firefox/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.xul
 lib/firefox/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.css
@@ -137,6 +136,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul
 lib/firefox/browser/chrome/browser/content/browser/ext-bookmarks.js
 lib/firefox/browser/chrome/browser/content/browser/ext-browser.js
+lib/firefox/browser/chrome/browser/content/browser/ext-browser.json
 lib/firefox/browser/chrome/browser/content/browser/ext-browserAction.js
 lib/firefox/browser/chrome/browser/content/browser/ext-browsingData.js
 lib/firefox/browser/chrome/browser/content/browser/ext-c-browser.js
@@ -152,6 +152,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/ext-devtools-network.js
 lib/firefox/browser/chrome/browser/content/browser/ext-devtools-panels.js
 lib/firefox/browser/chrome/browser/content/browser/ext-devtools.js
+lib/firefox/browser/chrome/browser/content/browser/ext-find.js
 lib/firefox/browser/chrome/browser/content/browser/ext-geckoProfiler.js
 lib/firefox/browser/chrome/browser/content/browser/ext-history.js
 lib/firefox/browser/chrome/browser/content/browser/ext-menus.js
@@ -161,7 +162,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/ext-sidebarAction.js
 lib/firefox/browser/chrome/browser/content/browser/ext-tabs.js
 lib/firefox/browser/chrome/browser/content/browser/ext-url-overrides.js
-lib/firefox/browser/chrome/browser/content/browser/ext-utils.js
 lib/firefox/browser/chrome/browser/content/browser/ext-windows.js
 lib/firefox/browser/chrome/browser/content/browser/extension.css
 lib/firefox/browser/chrome/browser/content/browser/extension.svg
@@ -169,6 +169,9 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xhtml
 lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul
 lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul
+lib/firefox/browser/chrome/browser/content/browser/illustrations/error-connection-failure.svg
+lib/firefox/browser/chrome/browser/content/browser/illustrations/error-malformed-url.svg
+lib/firefox/browser/chrome/browser/content/browser/illustrations/error-server-not-found.svg
 lib/firefox/browser/chrome/browser/content/browser/license.html
 lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
 lib/firefox/browser/chrome/browser/content/browser/migration/migration.js
@@ -221,25 +224,13 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css
 lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.xml
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/containers.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/findInPage.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/main.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/preferences.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/preferences.xul
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/privacy.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/search.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/subdialogs.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/sync.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/advanced.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/applications.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/containers.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/content.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/findInPage.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/main.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/privacy.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/search.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/security.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/subdialogs.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/sync.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/languages.js
@@ -256,6 +247,9 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/siteListItem.xml
+lib/firefox/browser/chrome/browser/content/browser/preferences/sitePermissions.css
+lib/firefox/browser/chrome/browser/content/browser/preferences/sitePermissions.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/sitePermissions.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/translation.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/translation.xul
 lib/firefox/browser/chrome/browser/content/browser/report-phishing-overlay.xul
@@ -276,6 +270,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_inspected_window.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_network.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_panels.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/find.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/geckoProfiler.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/history.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/menus.json
@@ -293,7 +288,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/search/searchbarBindings.css
 lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.js
 lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.xul
-lib/firefox/browser/chrome/browser/content/browser/social-content.js
 lib/firefox/browser/chrome/browser/content/browser/static-robot.png
 lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.js
 lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml
@@ -302,11 +296,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/tabbrowser.xml
 lib/firefox/browser/chrome/browser/content/browser/translation-infobar.xml
 lib/firefox/browser/chrome/browser/content/browser/urlbarBindings.xml
-lib/firefox/browser/chrome/browser/content/browser/usercontext-briefcase.svg
-lib/firefox/browser/chrome/browser/content/browser/usercontext-cart.svg
-lib/firefox/browser/chrome/browser/content/browser/usercontext-circle.svg
-lib/firefox/browser/chrome/browser/content/browser/usercontext-dollar.svg
-lib/firefox/browser/chrome/browser/content/browser/usercontext-fingerprint.svg
 lib/firefox/browser/chrome/browser/content/browser/usercontext/usercontext.css
 lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js
 lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul
@@ -316,16 +305,24 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/webext-panels.xul
 lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js
 lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul
-lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png
+lib/firefox/browser/chrome/browser/content/cart.svg
+lib/firefox/browser/chrome/browser/content/chill.svg
+lib/firefox/browser/chrome/browser/content/circle.svg
+lib/firefox/browser/chrome/browser/content/dollar.svg
+lib/firefox/browser/chrome/browser/content/fingerprint.svg
+lib/firefox/browser/chrome/browser/content/food.svg
+lib/firefox/browser/chrome/browser/content/fruit.svg
+lib/firefox/browser/chrome/browser/content/gift.svg
+lib/firefox/browser/chrome/browser/content/pet.svg
+lib/firefox/browser/chrome/browser/content/tree.svg
+lib/firefox/browser/chrome/browser/content/vacation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutNetError.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/aboutProviderDirectory.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSocialError.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutTabCrashed.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutWelcomeBack.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/addons.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-anchor.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/accessibility-active.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/accessibility.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-downloading.svg
@@ -333,30 +330,28 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-installed.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-restart.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-warning.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/arrow-dropdown.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/arrow-left.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/back-12.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/back-large.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/back.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/blockedSite.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/bookmark-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/bookmark-hollow.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/bookmark-star-on-tray.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/bookmark.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/bookmarksMenu.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/bookmarks-toolbar.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/cert-error.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/characterEncoding.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/check-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/check.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/chevron-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/chevron.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/loading-inverted.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/loading-inverted%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/urlbar-history-dropmarker.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/connection-secure.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/containers.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-not-secure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/connection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/extension.svg
@@ -366,42 +361,33 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/tracking-protection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/warning-gray.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/warning-yellow.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/background-noise-toolbar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration-rtl.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration-rtl%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeFavicon.ico
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-gridTexture.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-separatorVertical.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/info-icon-customizeTip.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/info-icon-customizeTip%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/density-compact.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/density-normal.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/density-touch.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/empty-overflow-panel.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/empty-overflow-panel%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/panelUI.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/panelarrow-customizeTip.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/panelarrow-customizeTip%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customize.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/developer.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/device-desktop.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/device-mobile.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/device-tablet.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/download.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsViewOverlay.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-blocked.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow-menuPanel.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-finish.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-start.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-icons.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/notification-start-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/drm-icon.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/e10s-64%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/edit-copy.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/edit-cut.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/edit-paste.svg
@@ -411,34 +397,26 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/find.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/folder.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/forget.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/forward.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen-enter.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen-exit.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/insecure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/secure.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/android.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/android%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/default-avatar.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/ios.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/ios%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/gear.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/help.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/history.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/home.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/icon-search-64.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon-hover.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon-notice-hover.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon-notice.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/link.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/mail.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/menu-badged.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/menu.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize%2x.png@localhost
@@ -446,8 +424,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-small.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/new-tab.svg
@@ -455,8 +431,33 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/close.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/default-info.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/focus-tab-by-prompt.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo-detailed.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/login-detailed.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/login.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-detailed.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-badge.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/popup.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/screen-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/screen.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/update.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/open.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/page-action.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/page-livemarks.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.png
@@ -477,10 +478,8 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar-menuPanel.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/places/calendar.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/downloads.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/editBookmarkOverlay.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/folder-live.svg
@@ -491,34 +490,39 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/organizer.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/organizer.xml
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/places.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/places/query.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/starred48.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/tag.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/unfiledBookmarks.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/places/unstarred48.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/containers.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/containers.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/dialog.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/favicon.ico
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/icons.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/preferences.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search-arrow-indicator.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/siteDataSettings.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/critters-postcard.jpg
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-sad.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-smile.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/fxa-avatar.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/general.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-android.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-ios.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-bar.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-results.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy-security.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-arrow-indicator.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-bar.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/siteDataSettings.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sync-devices.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sync.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/print.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/private-browsing.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/privateBrowsing.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/favicon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/private-browsing.svg
@@ -526,68 +530,43 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/quit.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/readerMode.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/reload-stop-go.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/reload-stop-go%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/reload-to-stop.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/reload.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/restore-session.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sanitizeDialog.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/save.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-arrow-go.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-magnifying-glass.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/search-glass.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/searchReset.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/searchbar.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/session-restore.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/settings.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/share.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/sidebar/close.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars-right.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-64.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/stop-to-reload.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/stop.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sync.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/synced-tabs.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/syncedtabs/sidebar.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/tab-crashed.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/crashed.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/indicator-tab-attention.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading-burst.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/newtab.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/pendingpaint.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-muted.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-playing.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-small.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-start.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-start%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-indicator.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-end.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-start.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-end.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-end%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/toolbarbutton-dropdown-arrow.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-16.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png
@@ -603,6 +582,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-indicator.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/welcome-back.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/wifi.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/window.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/zoom-in.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/zoom-out.svg
 lib/firefox/browser/chrome/browser/skin/classic/communicator/communicator.css
@@ -618,7 +598,6 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/canvasdebugger/canvasdebugger.js
 lib/firefox/browser/chrome/devtools/content/canvasdebugger/canvasdebugger.xul
 lib/firefox/browser/chrome/devtools/content/canvasdebugger/snapshotslist.js
-lib/firefox/browser/chrome/devtools/content/commandline/commandline.css
 lib/firefox/browser/chrome/devtools/content/commandline/commandlineoutput.xhtml
 lib/firefox/browser/chrome/devtools/content/commandline/commandlinetooltip.xhtml
 lib/firefox/browser/chrome/devtools/content/debugger/debugger-controller.js
@@ -815,6 +794,12 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/sidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExtensionSidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectTreeView.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/extension-sidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/reducers/sidebar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/font-options.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/fonts.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/index.js
@@ -1001,6 +986,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/timings-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-connector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-data-provider.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-automation.js
@@ -1132,7 +1118,8 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/window.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/resize-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign-child.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign-old.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-manager.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-panel.js
@@ -1170,17 +1157,13 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-angle.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-reload.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/curl.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/developer-toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devices.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devtools-file-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/doorhanger.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/enum.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-saver.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-watcher-worker.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/getjson.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/inplace-editor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/key-shortcuts.js
@@ -1216,10 +1199,10 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/immutable.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jsol.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jszip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/lodash.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-addons-shallow-compare.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-proxy.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-virtualized.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react.js
@@ -1331,6 +1314,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-table.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-bar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-button.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-checkbox.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/grip-message-body.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-container.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-icon.js
@@ -1381,10 +1365,9 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/project-list.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtime-list.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtimes.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/simulator-process.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/simulators.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/tab-store.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/accessibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/actor-registry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/addon.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/addons.js
@@ -1433,7 +1416,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/preference.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/pretty-print-worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/process.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/profiler.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/promises.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/reflow.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/root.js
@@ -1441,7 +1423,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/source.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/string.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/styleeditor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/styles.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/stylesheets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/tab.js
@@ -1456,12 +1437,13 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-geometry-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-listeners.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-worker-listeners.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webaudio.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webbrowser.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/content-process-forward.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole/worker-listeners.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension-inspected-window.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension-parent.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension.js
@@ -1496,6 +1478,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/apps/app-actor-front.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/base-loader.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/builtin-modules.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/main.js
@@ -1515,6 +1498,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/event-emitter.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/extend.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/flags.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/accessibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/actor-registry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/addons.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/animation.js
@@ -1535,7 +1519,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/preference.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/profiler.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/promises.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/reflow.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/storage.js
@@ -1640,6 +1623,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/census-tree-node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/shortest-paths.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/indentation.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/indexed-db.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/inspector/css-logic.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/beautify.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/sanitytest.js
@@ -1653,6 +1637,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/layout/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/loader-plugin-raw.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/node-properties/node-properties.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/old-event-emitter.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/path.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/performance/recording-common.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/performance/recording-utils.js
@@ -1671,6 +1656,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/prompt.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/socket.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/sourcemap/source-map.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/accessibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/actor-registry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/addons.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/animation.js
@@ -1688,6 +1674,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/gcli.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/heap-snapshot-file.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/highlighters.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/inspector.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/memory.js
@@ -1696,14 +1683,12 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/preference.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/profiler.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/promises.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/reflow.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/script.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/source.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/storage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/string.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/styleeditor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/styles.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/stylesheets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/timeline.js
@@ -1976,19 +1961,6 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/browser/places/moveBookmarks.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/places/places.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/places/places.properties
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/advanced.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/applications.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/containers.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/containers.properties
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/content.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/main.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/preferences.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/preferences.properties
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/privacy.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/search.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/security.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/sync.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/tabs.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/preferences/advanced.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/preferences/applicationManager.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/preferences/applicationManager.properties
@@ -2022,12 +1994,24 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/safebrowsing.properties
 lib/firefox/browser/chrome/en-US/locale/browser/sanitize.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/search.properties
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/amazon-au.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/amazon-ca.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/amazondotcom.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/bing.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ddg.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-au.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-be.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-ca.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-ch.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-ie.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-nl.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay-uk.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ebay.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google-2018.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google-nocodes.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/amazon.ico
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/ebay.ico
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/wikipedia.ico
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yahoo.ico
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-en.ico
@@ -2071,7 +2055,6 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/inspector.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/jit-optimizations.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/jsonview.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/key-shortcuts.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/layout.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/markers.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/memory.properties
@@ -2109,6 +2092,7 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/gclicommands.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/shared.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/styleinspector.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shim/key-shortcuts.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/formautofill.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
@@ -2404,8 +2388,6 @@ lib/firefox/browser/chrome/webide/conten
 lib/firefox/browser/chrome/webide/content/runtime-panel.js
 lib/firefox/browser/chrome/webide/content/runtimedetails.js
 lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml
-lib/firefox/browser/chrome/webide/content/simulator.js
-lib/firefox/browser/chrome/webide/content/simulator.xhtml
 lib/firefox/browser/chrome/webide/content/webide.js
 lib/firefox/browser/chrome/webide/content/webide.xul
 lib/firefox/browser/chrome/webide/content/wifi-auth.js
@@ -2422,7 +2404,6 @@ lib/firefox/browser/chrome/webide/skin/n
 lib/firefox/browser/chrome/webide/skin/panel-listing.css
 lib/firefox/browser/chrome/webide/skin/rocket.svg
 lib/firefox/browser/chrome/webide/skin/runtimedetails.css
-lib/firefox/browser/chrome/webide/skin/simulator.css
 lib/firefox/browser/chrome/webide/skin/throbber.svg
 lib/firefox/browser/chrome/webide/skin/webide.css
 lib/firefox/browser/chrome/webide/skin/wifi-auth.css
@@ -2451,6 +2432,7 @@ lib/firefox/browser/defaults/blocklists/
 lib/firefox/browser/defaults/permissions
 lib/firefox/browser/defaults/pinning/pins.json
 lib/firefox/browser/defaults/preferences/debugger.js
+lib/firefox/browser/defaults/preferences/devtools-startup-prefs.js
 lib/firefox/browser/defaults/preferences/devtools.js
 lib/firefox/browser/defaults/preferences/firefox-branding.js
 lib/firefox/browser/defaults/preferences/firefox-l10n.js
@@ -2463,73 +2445,70 @@ lib/firefox/browser/features/activity-st
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Actions.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Dedupe.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/PerfService.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/PrerenderData.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Reducers.jsm
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/ShortURL.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream-initial-state.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream-prerendered.html
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.bundle.js
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.css
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.html
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-bookmark-16.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-bookmark-remove-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-delete-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-dismiss-16.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-forward-16-white.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-forward-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-edit-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-highlights-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-historyItem-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-import-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-info-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-info-option-12.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-more-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-newWindow-16.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-newWindow-private-16.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-now-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-pin-12.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-pin-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-pocket-16.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-search-16.svg
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-settings-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-topsites-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-trending-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-unpin-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-webextension-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/topic-show-more-12.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/aliexpress-com%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/allegro-pl%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-ca%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-com%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-de%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-fr%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-uk%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/avito%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/avito-ru%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/bbc-uk%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ebay-de%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ebay%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/facebook-com%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/leboncoin%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ok%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/leboncoin-fr%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ok-ru%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/olx-pl%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/reddit-com%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/twitter-com%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/vk-com%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wikipedia-com%2x.png@localhost
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wykop%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wikipedia-org%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wykop-pl%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/youtube-com%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/top_sites.json
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/locales.json
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStream.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStreamMessageChannel.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStreamPrefs.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/FilterAdult.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/HighlightsFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/LinksCache.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/LocalizationFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ManualMigration.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/NewTabInit.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PlacesFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PrefsFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/Screenshots.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/SectionsManager.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ShortURL.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/SnippetsFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/Store.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/SystemTickFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TelemetryFeed.jsm
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TelemetrySender.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TippyTopProvider.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TopSitesFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TopStoriesFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/UserDomainAffinityProvider.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/Redux.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-dom.js
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-intl.js
@@ -2539,8 +2518,6 @@ lib/firefox/browser/features/activity-st
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/aushelper%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/aushelper%mozilla.org@localhost/install.rdf
-lib/firefox/browser/features/clicktoplay-rollout%mozilla.org@localhost/bootstrap.js
-lib/firefox/browser/features/clicktoplay-rollout%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/e10srollout%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/e10srollout%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/firefox%getpocket.com@localhost/bootstrap.js
@@ -2595,10 +2572,8 @@ lib/firefox/browser/features/firefox@get
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/content/pocket-content-process.js
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/menuPanel.png
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/menuPanel%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/pocket.css
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/library-pocket-animation.svg
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket-animation.svg
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket-list.svg
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket.css
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket.svg
 lib/firefox/browser/features/firefox%getpocket.com@localhost/en-US/locale/en-US/pocket.properties
@@ -2611,17 +2586,21 @@ lib/firefox/browser/features/formautofil
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome.manifest
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/FormAutofillFrameScript.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/addressReferences.js
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/editAddress.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/editAddress.xhtml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/editCreditCard.xhtml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/editDialog.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/formautofill.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/formautofill.xml
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/formfill-anchor.svg
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/heuristicsRegexp.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/icon-address-save.svg
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/icon-address-update.svg
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageAddresses.css
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageAddresses.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/icon-credit-card-generic.svg
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/icon-credit-card.svg
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageAddresses.xhtml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageCreditCards.xhtml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageDialog.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageDialog.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/nameReferences.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillContent.jsm
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillDoorhanger.jsm
@@ -2639,45 +2618,49 @@ lib/firefox/browser/features/formautofil
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumberMetaData.jsm
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumberNormalizer.jsm
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/linux/autocomplete-item.css
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/linux/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/linux/editDialog.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/osx/autocomplete-item.css
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/osx/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/osx/editDialog.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/autocomplete-item.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/editCreditCard.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/editDialog.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/autocomplete-item.css
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/editDialog.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome.manifest
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_addons.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_customize.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_default.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_library.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_performance.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_private.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_search.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_screenshots.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_singlesearch.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_sync.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons-colored.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons-notification.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize-colored.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize-notification.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default-colored.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default-notification.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_library-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_library.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_performance-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_performance.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private-colored.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private-notification.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_search-colored.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_search-notification.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_search.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_screenshots-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_screenshots.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_singlesearch-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_singlesearch.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync-colored.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync-notification.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_tour-complete.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/overlay-icon.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/watermark.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/lib/UITour-lib.js
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/modules/OnboardingTelemetry.jsm
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/modules/OnboardingTourType.jsm
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding-tour-agent.js
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding.css
@@ -2688,6 +2671,7 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ach/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ar/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ast/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/az/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/be/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/bg/messages.json
@@ -2708,6 +2692,7 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/es_ES/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/es_MX/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/et/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/eu/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fa/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fi/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fr/messages.json
@@ -2773,6 +2758,7 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/startBackground.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/takeshot.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/blank.html
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/blobConverters.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/buildSettings.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/inlineSelectionCss.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/onboardingCss.js
@@ -2795,12 +2781,14 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-starred-32-v2.svg
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-welcome-face-without-eyes.svg
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/menu-fullpage.svg
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/menu-myshot-white.svg
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/menu-myshot.svg
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/menu-visible.svg
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/onboarding-1.png
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/onboarding-2.png
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/onboarding-3.png
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/onboarding-4.png
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/onboarding-5.png
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/log.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/makeUuid.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/manifest.json
@@ -2870,18 +2858,20 @@ lib/firefox/browser/modules/AttributionC
 lib/firefox/browser/modules/AutoMigrate.jsm
 lib/firefox/browser/modules/BrowserUITelemetry.jsm
 lib/firefox/browser/modules/BrowserUsageTelemetry.jsm
-lib/firefox/browser/modules/CastingApps.jsm
 lib/firefox/browser/modules/ContentClick.jsm
 lib/firefox/browser/modules/ContentCrashHandlers.jsm
 lib/firefox/browser/modules/ContentLinkHandler.jsm
+lib/firefox/browser/modules/ContentMetaHandler.jsm
 lib/firefox/browser/modules/ContentObservers.js
 lib/firefox/browser/modules/ContentSearch.jsm
 lib/firefox/browser/modules/ContentWebRTC.jsm
+lib/firefox/browser/modules/ContextMenu.jsm
 lib/firefox/browser/modules/CustomizableUI.jsm
 lib/firefox/browser/modules/CustomizableWidgets.jsm
 lib/firefox/browser/modules/CustomizeMode.jsm
 lib/firefox/browser/modules/DirectoryLinksProvider.jsm
 lib/firefox/browser/modules/DownloadsCommon.jsm
+lib/firefox/browser/modules/DownloadsSubview.jsm
 lib/firefox/browser/modules/DownloadsTaskbar.jsm
 lib/firefox/browser/modules/DownloadsViewUI.jsm
 lib/firefox/browser/modules/DragPositionManager.jsm
@@ -2891,6 +2881,7 @@ lib/firefox/browser/modules/ExtensionsUI
 lib/firefox/browser/modules/Feeds.jsm
 lib/firefox/browser/modules/FormSubmitObserver.jsm
 lib/firefox/browser/modules/FormValidationHandler.jsm
+lib/firefox/browser/modules/HeadlessShell.jsm
 lib/firefox/browser/modules/LaterRun.jsm
 lib/firefox/browser/modules/MigrationUtils.jsm
 lib/firefox/browser/modules/NewTabPrefsProvider.jsm
@@ -2906,6 +2897,7 @@ lib/firefox/browser/modules/ParseCppFilt
 lib/firefox/browser/modules/ParseNMSymbols-worker.js
 lib/firefox/browser/modules/ParseSymbols.jsm
 lib/firefox/browser/modules/PermissionUI.jsm
+lib/firefox/browser/modules/PingCentre.jsm
 lib/firefox/browser/modules/PlacesUIUtils.jsm
 lib/firefox/browser/modules/PluginContent.jsm
 lib/firefox/browser/modules/ProcessHangMonitor.jsm
@@ -2918,8 +2910,6 @@ lib/firefox/browser/modules/SearchWidget
 lib/firefox/browser/modules/ShellService.jsm
 lib/firefox/browser/modules/SiteDataManager.jsm
 lib/firefox/browser/modules/SitePermissions.jsm
-lib/firefox/browser/modules/Social.jsm
-lib/firefox/browser/modules/SocialService.jsm
 lib/firefox/browser/modules/TransientPrefs.jsm
 lib/firefox/browser/modules/UITour.jsm
 lib/firefox/browser/modules/UpdateTopLevelContentWindowIDHelper.jsm
@@ -2931,7 +2921,6 @@ lib/firefox/browser/modules/experiments/
 lib/firefox/browser/modules/offlineAppCache.jsm
 lib/firefox/browser/modules/sessionstore/ContentRestore.jsm
 lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm
-lib/firefox/browser/modules/sessionstore/FrameTree.jsm
 lib/firefox/browser/modules/sessionstore/GlobalState.jsm
 lib/firefox/browser/modules/sessionstore/PrivacyFilter.jsm
 lib/firefox/browser/modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
@@ -3087,7 +3076,6 @@ lib/firefox/chrome/en-US/locale/en-US/mo
 lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/extensions.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.properties
-lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/update.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/update.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/handling/handling.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/handling/handling.properties
@@ -3123,6 +3111,7 @@ lib/firefox/chrome/marionette/content/br
 lib/firefox/chrome/marionette/content/capture.js
 lib/firefox/chrome/marionette/content/cert.js
 lib/firefox/chrome/marionette/content/cookie.js
+lib/firefox/chrome/marionette/content/dom.js
 lib/firefox/chrome/marionette/content/driver.js
 lib/firefox/chrome/marionette/content/element.js
 lib/firefox/chrome/marionette/content/error.js
@@ -3197,11 +3186,12 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/ext-c-storage.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-test.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-toolkit.js
+lib/firefox/chrome/toolkit/content/extensions/ext-c-webRequest.js
+lib/firefox/chrome/toolkit/content/extensions/ext-clipboard.js
 lib/firefox/chrome/toolkit/content/extensions/ext-contextualIdentities.js
 lib/firefox/chrome/toolkit/content/extensions/ext-cookies.js
 lib/firefox/chrome/toolkit/content/extensions/ext-downloads.js
 lib/firefox/chrome/toolkit/content/extensions/ext-extension.js
-lib/firefox/chrome/toolkit/content/extensions/ext-geolocation.js
 lib/firefox/chrome/toolkit/content/extensions/ext-i18n.js
 lib/firefox/chrome/toolkit/content/extensions/ext-identity.js
 lib/firefox/chrome/toolkit/content/extensions/ext-idle.js
@@ -3213,13 +3203,16 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/ext-proxy.js
 lib/firefox/chrome/toolkit/content/extensions/ext-runtime.js
 lib/firefox/chrome/toolkit/content/extensions/ext-storage.js
+lib/firefox/chrome/toolkit/content/extensions/ext-tabs-base.js
 lib/firefox/chrome/toolkit/content/extensions/ext-theme.js
 lib/firefox/chrome/toolkit/content/extensions/ext-toolkit.js
+lib/firefox/chrome/toolkit/content/extensions/ext-toolkit.json
 lib/firefox/chrome/toolkit/content/extensions/ext-topSites.js
 lib/firefox/chrome/toolkit/content/extensions/ext-webNavigation.js
 lib/firefox/chrome/toolkit/content/extensions/ext-webRequest.js
 lib/firefox/chrome/toolkit/content/extensions/schemas/alarms.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/browser_settings.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/clipboard.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/contextual_identities.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/cookies.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/downloads.json
@@ -3233,7 +3226,7 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/schemas/idle.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/management.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/manifest.json
-lib/firefox/chrome/toolkit/content/extensions/schemas/native_host_manifest.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/native_manifest.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/notifications.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/permissions.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/privacy.json
@@ -3295,7 +3288,6 @@ lib/firefox/chrome/toolkit/content/globa
 lib/firefox/chrome/toolkit/content/global/autocomplete.css
 lib/firefox/chrome/toolkit/content/global/backgroundPageThumbs.xhtml
 lib/firefox/chrome/toolkit/content/global/backgroundPageThumbsContent.js
-${PLIST.webrtc}lib/firefox/components/PeerConnection.js
 lib/firefox/chrome/toolkit/content/global/bindings/autocomplete.xml
 lib/firefox/chrome/toolkit/content/global/bindings/browser.xml
 lib/firefox/chrome/toolkit/content/global/bindings/button.xml
@@ -3443,8 +3435,9 @@ lib/firefox/chrome/toolkit/content/mozap
 lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/setting.xml
+lib/firefox/chrome/toolkit/content/mozapps/extensions/update.css
+lib/firefox/chrome/toolkit/content/mozapps/extensions/update.html
 lib/firefox/chrome/toolkit/content/mozapps/extensions/update.js
-lib/firefox/chrome/toolkit/content/mozapps/extensions/update.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/updateinfo.xsl
 lib/firefox/chrome/toolkit/content/mozapps/handling/dialog.js
 lib/firefox/chrome/toolkit/content/mozapps/handling/dialog.xul
@@ -3503,10 +3496,8 @@ lib/firefox/chrome/toolkit/res/mathml.cs
 lib/firefox/chrome/toolkit/res/noframes.css
 lib/firefox/chrome/toolkit/res/noscript.css
 lib/firefox/chrome/toolkit/res/number-control.css
-lib/firefox/chrome/toolkit/res/plaintext.css
 lib/firefox/chrome/toolkit/res/quirk.css
 lib/firefox/chrome/toolkit/res/ua.css
-lib/firefox/chrome/toolkit/res/viewsource.css
 lib/firefox/chrome/toolkit/skin/classic/global/Filepicker.png
 lib/firefox/chrome/toolkit/skin/classic/global/about.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutCache.css
@@ -3515,8 +3506,8 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/aboutReader.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutReaderContent.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutReaderControls.css
+lib/firefox/chrome/toolkit/skin/classic/global/aboutRights.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutSupport.css
-lib/firefox/chrome/toolkit/skin/classic/global/alerts/alert-common.css
 lib/firefox/chrome/toolkit/skin/classic/global/alerts/alert.css
 lib/firefox/chrome/toolkit/skin/classic/global/appPicker.css
 lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn-dis.gif
@@ -3547,7 +3538,6 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/expander.css
 lib/firefox/chrome/toolkit/skin/classic/global/filefield.css
 lib/firefox/chrome/toolkit/skin/classic/global/filepicker.css
-lib/firefox/chrome/toolkit/skin/classic/global/filters.svg
 lib/firefox/chrome/toolkit/skin/classic/global/findBar.css
 lib/firefox/chrome/toolkit/skin/classic/global/global.css
 lib/firefox/chrome/toolkit/skin/classic/global/globalBindings.xml
@@ -3556,7 +3546,8 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/Close.gif
 lib/firefox/chrome/toolkit/skin/classic/global/icons/Minimize.gif
 lib/firefox/chrome/toolkit/skin/classic/global/icons/Restore.gif
-lib/firefox/chrome/toolkit/skin/classic/global/icons/autocomplete-search.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/arrow-dropdown-12.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/arrow-dropdown-16.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_large.png
@@ -3565,13 +3556,14 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/calendar-arrow-right.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/error-16.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/error.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/find-next-arrow.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/find-previous-arrow.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/help.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/info.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/input-clear.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading%2x.png@localhost
-lib/firefox/chrome/toolkit/skin/classic/global/icons/menubutton-dropmarker.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/question-16.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/question-64.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer-rtl.png
@@ -3584,6 +3576,7 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-16.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-64.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/warning.svg
+lib/firefox/chrome/toolkit/skin/classic/global/illustrations/about-rights.svg
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/check-partial.svg
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/check.svg
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/common.css
@@ -3661,8 +3654,6 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/tabprompts.css
 lib/firefox/chrome/toolkit/skin/classic/global/textbox.css
 lib/firefox/chrome/toolkit/skin/classic/global/toolbar.css
-lib/firefox/chrome/toolkit/skin/classic/global/toolbar/chevron-inverted.png
-lib/firefox/chrome/toolkit/skin/classic/global/toolbar/chevron.gif
 lib/firefox/chrome/toolkit/skin/classic/global/toolbar/spring.png
 lib/firefox/chrome/toolkit/skin/classic/global/toolbarbutton.css
 lib/firefox/chrome/toolkit/skin/classic/global/tree.css
@@ -3687,28 +3678,25 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-warning.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/blocklist.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-available.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-legacy.svg
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-plugins.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-search.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-service.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-search.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-service.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/discover-logo.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/eula.css
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensions.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/heart.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/navigation.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/newaddon.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/update.css
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/utilities.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/handling/handling.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.svg
@@ -3717,10 +3705,8 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginStripe.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked-64.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric-16.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginHelp-16.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginProblem.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileSelection.css
@@ -3732,6 +3718,7 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/components/BrowserElementParent.js
 lib/firefox/components/ColorAnalyzer.js
 lib/firefox/components/ConsoleAPIStorage.js
+lib/firefox/components/ContentPrefService2.js
 lib/firefox/components/ContentProcessSingleton.js
 lib/firefox/components/DownloadLegacy.js
 lib/firefox/components/EditorUtils.js
@@ -3743,6 +3730,7 @@ lib/firefox/components/NetworkGeolocatio
 lib/firefox/components/NotificationStorage.js
 lib/firefox/components/PageIconProtocolHandler.js
 lib/firefox/components/PageThumbsProtocol.js
+${PLIST.webrtc}lib/firefox/components/PeerConnection.js
 lib/firefox/components/PlacesCategoriesStarter.js
 lib/firefox/components/PresentationControlService.js
 lib/firefox/components/PresentationDataChannelSessionTransport.js
@@ -3781,7 +3769,6 @@ lib/firefox/components/nsAsyncShutdown.j
 lib/firefox/components/nsBlocklistService.js
 lib/firefox/components/nsBlocklistServiceContent.js
 lib/firefox/components/nsContentDispatchChooser.js
-lib/firefox/components/nsContentPrefService.js
 lib/firefox/components/nsCrashMonitor.js
 lib/firefox/components/nsDNSServiceDiscovery.js
 lib/firefox/components/nsDefaultCLH.js
@@ -3813,6 +3800,11 @@ lib/firefox/components/recording-cmdline
 lib/firefox/components/simpleServices.js
 lib/firefox/components/storage-json.js
 lib/firefox/components/txEXSLTRegExFunctions.js
+lib/firefox/contentaccessible/ImageDocument.css
+lib/firefox/contentaccessible/TopLevelImageDocument.css
+lib/firefox/contentaccessible/TopLevelVideoDocument.css
+lib/firefox/contentaccessible/plaintext.css
+lib/firefox/contentaccessible/viewsource.css
 lib/firefox/defaults/autoconfig/prefcalls.js
 lib/firefox/defaults/pref/channel-prefs.js
 lib/firefox/defaults/pref/marionette.js
@@ -3896,8 +3888,6 @@ lib/firefox/modules/ColorConversion.js
 lib/firefox/modules/CommonDialog.jsm
 lib/firefox/modules/CompatWarning.jsm
 lib/firefox/modules/Console.jsm
-lib/firefox/modules/ContentPrefInstance.jsm
-lib/firefox/modules/ContentPrefService2.jsm
 lib/firefox/modules/ContentPrefServiceChild.jsm
 lib/firefox/modules/ContentPrefServiceParent.jsm
 lib/firefox/modules/ContentPrefStore.jsm
@@ -3909,6 +3899,7 @@ lib/firefox/modules/DNSPacket.jsm
 lib/firefox/modules/DNSRecord.jsm
 lib/firefox/modules/DNSResourceRecord.jsm
 lib/firefox/modules/DNSTypes.jsm
+lib/firefox/modules/DOMLocalization.jsm
 lib/firefox/modules/DOMRequestHelper.jsm
 lib/firefox/modules/DataReader.jsm
 lib/firefox/modules/DataWriter.jsm
@@ -3928,7 +3919,6 @@ lib/firefox/modules/DownloadUtils.jsm
 lib/firefox/modules/Downloads.jsm
 lib/firefox/modules/EventEmitter.jsm
 lib/firefox/modules/Extension.jsm
-lib/firefox/modules/ExtensionAPI.jsm
 lib/firefox/modules/ExtensionChild.jsm
 lib/firefox/modules/ExtensionChildDevToolsUtils.jsm
 lib/firefox/modules/ExtensionCommon.jsm
@@ -3941,9 +3931,9 @@ lib/firefox/modules/ExtensionSearchHandl
 lib/firefox/modules/ExtensionSettingsStore.jsm
 lib/firefox/modules/ExtensionStorage.jsm
 lib/firefox/modules/ExtensionStorageSync.jsm
-lib/firefox/modules/ExtensionTabs.jsm
 lib/firefox/modules/ExtensionUtils.jsm
 lib/firefox/modules/FileUtils.jsm
+lib/firefox/modules/FindContent.jsm
 lib/firefox/modules/Finder.jsm
 lib/firefox/modules/FinderHighlighter.jsm
 lib/firefox/modules/FinderIterator.jsm
@@ -3965,7 +3955,6 @@ lib/firefox/modules/GMPExtractorWorker.j
 lib/firefox/modules/GMPInstallManager.jsm
 lib/firefox/modules/GMPUtils.jsm
 lib/firefox/modules/Geometry.jsm
-lib/firefox/modules/HiddenFrame.jsm
 lib/firefox/modules/History.jsm
 lib/firefox/modules/Http.jsm
 lib/firefox/modules/ISO8601DateUtils.jsm
@@ -3977,11 +3966,12 @@ lib/firefox/modules/InlineSpellCheckerCo
 lib/firefox/modules/InsecurePasswordUtils.jsm
 lib/firefox/modules/Integration.jsm
 lib/firefox/modules/JSONFile.jsm
+lib/firefox/modules/L10nRegistry.jsm
 lib/firefox/modules/LegacyExtensionsUtils.jsm
 lib/firefox/modules/LightweightThemeConsumer.jsm
 lib/firefox/modules/LightweightThemeManager.jsm
 lib/firefox/modules/LoadContextInfo.jsm
-lib/firefox/modules/Locale.jsm
+lib/firefox/modules/Localization.jsm
 lib/firefox/modules/Log.jsm
 lib/firefox/modules/LoginHelper.jsm
 lib/firefox/modules/LoginImport.jsm
@@ -3998,8 +3988,10 @@ lib/firefox/modules/ManifestProcessor.js
 lib/firefox/modules/MatchPattern.jsm
 lib/firefox/modules/Memory.jsm
 lib/firefox/modules/MessageChannel.jsm
+lib/firefox/modules/MessageContext.jsm
 lib/firefox/modules/MulticastDNS.jsm
 lib/firefox/modules/NLP.jsm
+lib/firefox/modules/NativeManifests.jsm
 lib/firefox/modules/NativeMessaging.jsm
 lib/firefox/modules/NetUtil.jsm
 lib/firefox/modules/NewTabUtils.jsm
@@ -4045,7 +4037,7 @@ lib/firefox/modules/PushServiceWebSocket
 lib/firefox/modules/ReaderMode.jsm
 lib/firefox/modules/RemoteAddonsChild.jsm
 lib/firefox/modules/RemoteAddonsParent.jsm
-lib/firefox/modules/RemoteController.jsm
+lib/firefox/modules/RemoteController.js
 lib/firefox/modules/RemoteFinder.jsm
 lib/firefox/modules/RemotePageManager.jsm
 lib/firefox/modules/RemoteSecurityUI.jsm
@@ -4063,7 +4055,6 @@ lib/firefox/modules/SelectParentHelper.j
 lib/firefox/modules/ServiceRequest.jsm
 lib/firefox/modules/Services.jsm
 lib/firefox/modules/SharedPromptUtils.jsm
-lib/firefox/modules/ShimWaiver.jsm
 lib/firefox/modules/ShortcutUtils.jsm
 lib/firefox/modules/SimpleServiceDiscovery.jsm
 lib/firefox/modules/Sqlite.jsm
@@ -4125,261 +4116,9 @@ lib/firefox/modules/addons/LightweightTh
 lib/firefox/modules/addons/PluginProvider.jsm
 lib/firefox/modules/addons/ProductAddonChecker.jsm
 lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js
-lib/firefox/modules/addons/WebExtensionBootstrap.js
 lib/firefox/modules/addons/XPIInstall.jsm
 lib/firefox/modules/addons/XPIProvider.jsm
 lib/firefox/modules/addons/XPIProviderUtils.js
-lib/firefox/modules/commonjs/dev/debuggee.js
-lib/firefox/modules/commonjs/dev/frame-script.js
-lib/firefox/modules/commonjs/dev/panel.js
-lib/firefox/modules/commonjs/dev/panel/view.js
-lib/firefox/modules/commonjs/dev/ports.js
-lib/firefox/modules/commonjs/dev/theme.js
-lib/firefox/modules/commonjs/dev/theme/hooks.js
-lib/firefox/modules/commonjs/dev/toolbox.js
-lib/firefox/modules/commonjs/dev/utils.js
-lib/firefox/modules/commonjs/dev/volcan.js
-lib/firefox/modules/commonjs/diffpatcher/diff.js
-lib/firefox/modules/commonjs/diffpatcher/index.js
-lib/firefox/modules/commonjs/diffpatcher/patch.js
-lib/firefox/modules/commonjs/diffpatcher/rebase.js
-lib/firefox/modules/commonjs/diffpatcher/test/common.js
-lib/firefox/modules/commonjs/diffpatcher/test/diff.js
-lib/firefox/modules/commonjs/diffpatcher/test/index.js
-lib/firefox/modules/commonjs/diffpatcher/test/patch.js
-lib/firefox/modules/commonjs/diffpatcher/test/tap.js
-lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm
-lib/firefox/modules/commonjs/framescript/content.jsm
-lib/firefox/modules/commonjs/framescript/context-menu.js
-lib/firefox/modules/commonjs/framescript/manager.js
-lib/firefox/modules/commonjs/framescript/util.js
-lib/firefox/modules/commonjs/index.js
-lib/firefox/modules/commonjs/jetpack-id/index.js
-lib/firefox/modules/commonjs/method/core.js
-lib/firefox/modules/commonjs/method/test/browser.js
-lib/firefox/modules/commonjs/method/test/common.js
-lib/firefox/modules/commonjs/mozilla-toolkit-versioning/index.js
-lib/firefox/modules/commonjs/mozilla-toolkit-versioning/lib/utils.js
-lib/firefox/modules/commonjs/node/os.js
-lib/firefox/modules/commonjs/sdk/addon/bootstrap.js
-lib/firefox/modules/commonjs/sdk/addon/events.js
-lib/firefox/modules/commonjs/sdk/addon/host.js
-lib/firefox/modules/commonjs/sdk/addon/installer.js
-lib/firefox/modules/commonjs/sdk/addon/manager.js
-lib/firefox/modules/commonjs/sdk/addon/runner.js
-lib/firefox/modules/commonjs/sdk/addon/window.js
-lib/firefox/modules/commonjs/sdk/base64.js
-lib/firefox/modules/commonjs/sdk/browser/events.js
-lib/firefox/modules/commonjs/sdk/clipboard.js
-lib/firefox/modules/commonjs/sdk/console/plain-text.js
-lib/firefox/modules/commonjs/sdk/console/traceback.js
-lib/firefox/modules/commonjs/sdk/content/content-worker.js
-lib/firefox/modules/commonjs/sdk/content/content.js
-lib/firefox/modules/commonjs/sdk/content/context-menu.js
-lib/firefox/modules/commonjs/sdk/content/events.js
-lib/firefox/modules/commonjs/sdk/content/l10n-html.js
-lib/firefox/modules/commonjs/sdk/content/loader.js
-lib/firefox/modules/commonjs/sdk/content/mod.js
-lib/firefox/modules/commonjs/sdk/content/page-mod.js
-lib/firefox/modules/commonjs/sdk/content/page-worker.js
-lib/firefox/modules/commonjs/sdk/content/sandbox.js
-lib/firefox/modules/commonjs/sdk/content/sandbox/events.js
-lib/firefox/modules/commonjs/sdk/content/tab-events.js
-lib/firefox/modules/commonjs/sdk/content/thumbnail.js
-lib/firefox/modules/commonjs/sdk/content/utils.js
-lib/firefox/modules/commonjs/sdk/content/worker-child.js
-lib/firefox/modules/commonjs/sdk/content/worker.js
-lib/firefox/modules/commonjs/sdk/context-menu.js
-lib/firefox/modules/commonjs/sdk/context-menu/context.js
-lib/firefox/modules/commonjs/sdk/context-menu/core.js
-lib/firefox/modules/commonjs/sdk/context-menu/readers.js
-lib/firefox/modules/commonjs/sdk/context-menu%2.js@localhost
-lib/firefox/modules/commonjs/sdk/core/disposable.js
-lib/firefox/modules/commonjs/sdk/core/heritage.js
-lib/firefox/modules/commonjs/sdk/core/namespace.js
-lib/firefox/modules/commonjs/sdk/core/observer.js
-lib/firefox/modules/commonjs/sdk/core/promise.js
-lib/firefox/modules/commonjs/sdk/core/reference.js
-lib/firefox/modules/commonjs/sdk/deprecated/api-utils.js
-lib/firefox/modules/commonjs/sdk/deprecated/events/assembler.js
-lib/firefox/modules/commonjs/sdk/deprecated/sync-worker.js
-lib/firefox/modules/commonjs/sdk/deprecated/unit-test-finder.js
-lib/firefox/modules/commonjs/sdk/deprecated/unit-test.js
-lib/firefox/modules/commonjs/sdk/deprecated/window-utils.js
-lib/firefox/modules/commonjs/sdk/dom/events-shimmed.js
-lib/firefox/modules/commonjs/sdk/dom/events.js
-lib/firefox/modules/commonjs/sdk/dom/events/keys.js
-lib/firefox/modules/commonjs/sdk/event/chrome.js
-lib/firefox/modules/commonjs/sdk/event/core.js
-lib/firefox/modules/commonjs/sdk/event/dom.js
-lib/firefox/modules/commonjs/sdk/event/target.js
-lib/firefox/modules/commonjs/sdk/event/utils.js
-lib/firefox/modules/commonjs/sdk/frame/hidden-frame.js
-lib/firefox/modules/commonjs/sdk/frame/utils.js
-lib/firefox/modules/commonjs/sdk/fs/path.js
-lib/firefox/modules/commonjs/sdk/hotkeys.js
-lib/firefox/modules/commonjs/sdk/indexed-db.js
-lib/firefox/modules/commonjs/sdk/input/browser.js
-lib/firefox/modules/commonjs/sdk/input/customizable-ui.js
-lib/firefox/modules/commonjs/sdk/input/frame.js
-lib/firefox/modules/commonjs/sdk/input/system.js
-lib/firefox/modules/commonjs/sdk/io/buffer.js
-lib/firefox/modules/commonjs/sdk/io/byte-streams.js
-lib/firefox/modules/commonjs/sdk/io/file.js
-lib/firefox/modules/commonjs/sdk/io/fs.js
-lib/firefox/modules/commonjs/sdk/io/stream.js
-lib/firefox/modules/commonjs/sdk/io/text-streams.js
-lib/firefox/modules/commonjs/sdk/keyboard/hotkeys.js
-lib/firefox/modules/commonjs/sdk/keyboard/observer.js
-lib/firefox/modules/commonjs/sdk/keyboard/utils.js
-lib/firefox/modules/commonjs/sdk/l10n.js
-lib/firefox/modules/commonjs/sdk/l10n/core.js
-lib/firefox/modules/commonjs/sdk/l10n/html.js
-lib/firefox/modules/commonjs/sdk/l10n/json/core.js
-lib/firefox/modules/commonjs/sdk/l10n/loader.js
-lib/firefox/modules/commonjs/sdk/l10n/locale.js
-lib/firefox/modules/commonjs/sdk/l10n/plural-rules.js
-lib/firefox/modules/commonjs/sdk/l10n/prefs.js
-lib/firefox/modules/commonjs/sdk/l10n/properties/core.js
-lib/firefox/modules/commonjs/sdk/lang/functional.js
-lib/firefox/modules/commonjs/sdk/lang/functional/concurrent.js
-lib/firefox/modules/commonjs/sdk/lang/functional/core.js
-lib/firefox/modules/commonjs/sdk/lang/functional/helpers.js
-lib/firefox/modules/commonjs/sdk/lang/type.js
-lib/firefox/modules/commonjs/sdk/lang/weak-set.js
-lib/firefox/modules/commonjs/sdk/loader/cuddlefish.js
-lib/firefox/modules/commonjs/sdk/loader/sandbox.js
-lib/firefox/modules/commonjs/sdk/messaging.js
-lib/firefox/modules/commonjs/sdk/model/core.js
-lib/firefox/modules/commonjs/sdk/net/url.js
-lib/firefox/modules/commonjs/sdk/net/xhr.js
-lib/firefox/modules/commonjs/sdk/notifications.js
-lib/firefox/modules/commonjs/sdk/output/system.js
-lib/firefox/modules/commonjs/sdk/page-mod.js
-lib/firefox/modules/commonjs/sdk/page-mod/match-pattern.js
-lib/firefox/modules/commonjs/sdk/page-worker.js
-lib/firefox/modules/commonjs/sdk/panel.js
-lib/firefox/modules/commonjs/sdk/panel/events.js
-lib/firefox/modules/commonjs/sdk/panel/utils.js
-lib/firefox/modules/commonjs/sdk/passwords.js
-lib/firefox/modules/commonjs/sdk/passwords/utils.js
-lib/firefox/modules/commonjs/sdk/places/bookmarks.js
-lib/firefox/modules/commonjs/sdk/places/contract.js
-lib/firefox/modules/commonjs/sdk/places/events.js
-lib/firefox/modules/commonjs/sdk/places/favicon.js
-lib/firefox/modules/commonjs/sdk/places/history.js
-lib/firefox/modules/commonjs/sdk/places/host/host-bookmarks.js
-lib/firefox/modules/commonjs/sdk/places/host/host-query.js
-lib/firefox/modules/commonjs/sdk/places/host/host-tags.js
-lib/firefox/modules/commonjs/sdk/places/utils.js
-lib/firefox/modules/commonjs/sdk/platform/xpcom.js
-lib/firefox/modules/commonjs/sdk/preferences/event-target.js
-lib/firefox/modules/commonjs/sdk/preferences/native-options.js
-lib/firefox/modules/commonjs/sdk/preferences/service.js
-lib/firefox/modules/commonjs/sdk/preferences/utils.js
-lib/firefox/modules/commonjs/sdk/private-browsing.js
-lib/firefox/modules/commonjs/sdk/private-browsing/utils.js
-lib/firefox/modules/commonjs/sdk/querystring.js
-lib/firefox/modules/commonjs/sdk/remote/child.js
-lib/firefox/modules/commonjs/sdk/remote/core.js
-lib/firefox/modules/commonjs/sdk/remote/parent.js
-lib/firefox/modules/commonjs/sdk/remote/utils.js
-lib/firefox/modules/commonjs/sdk/request.js
-lib/firefox/modules/commonjs/sdk/selection.js
-lib/firefox/modules/commonjs/sdk/self.js
-lib/firefox/modules/commonjs/sdk/simple-prefs.js
-lib/firefox/modules/commonjs/sdk/simple-storage.js
-lib/firefox/modules/commonjs/sdk/stylesheet/style.js
-lib/firefox/modules/commonjs/sdk/stylesheet/utils.js
-lib/firefox/modules/commonjs/sdk/system.js
-lib/firefox/modules/commonjs/sdk/system/child_process.js
-lib/firefox/modules/commonjs/sdk/system/child_process/subprocess.js
-lib/firefox/modules/commonjs/sdk/system/environment.js
-lib/firefox/modules/commonjs/sdk/system/events-shimmed.js
-lib/firefox/modules/commonjs/sdk/system/events.js
-lib/firefox/modules/commonjs/sdk/system/globals.js
-lib/firefox/modules/commonjs/sdk/system/process.js
-lib/firefox/modules/commonjs/sdk/system/runtime.js
-lib/firefox/modules/commonjs/sdk/system/unload.js
-lib/firefox/modules/commonjs/sdk/system/xul-app.js
-lib/firefox/modules/commonjs/sdk/system/xul-app.jsm
-lib/firefox/modules/commonjs/sdk/tab/events.js
-lib/firefox/modules/commonjs/sdk/tabs.js
-lib/firefox/modules/commonjs/sdk/tabs/common.js
-lib/firefox/modules/commonjs/sdk/tabs/events.js
-lib/firefox/modules/commonjs/sdk/tabs/helpers.js
-lib/firefox/modules/commonjs/sdk/tabs/namespace.js
-lib/firefox/modules/commonjs/sdk/tabs/observer.js
-lib/firefox/modules/commonjs/sdk/tabs/tab-fennec.js
-lib/firefox/modules/commonjs/sdk/tabs/tab-firefox.js
-lib/firefox/modules/commonjs/sdk/tabs/tab.js
-lib/firefox/modules/commonjs/sdk/tabs/tabs-firefox.js
-lib/firefox/modules/commonjs/sdk/tabs/utils.js
-lib/firefox/modules/commonjs/sdk/tabs/worker.js
-lib/firefox/modules/commonjs/sdk/test.js
-lib/firefox/modules/commonjs/sdk/test/assert.js
-lib/firefox/modules/commonjs/sdk/test/harness.js
-lib/firefox/modules/commonjs/sdk/test/httpd.js
-lib/firefox/modules/commonjs/sdk/test/loader.js
-lib/firefox/modules/commonjs/sdk/test/memory.js
-lib/firefox/modules/commonjs/sdk/test/options.js
-lib/firefox/modules/commonjs/sdk/test/runner.js
-lib/firefox/modules/commonjs/sdk/test/utils.js
-lib/firefox/modules/commonjs/sdk/timers.js
-lib/firefox/modules/commonjs/sdk/ui.js
-lib/firefox/modules/commonjs/sdk/ui/button/action.js
-lib/firefox/modules/commonjs/sdk/ui/button/contract.js
-lib/firefox/modules/commonjs/sdk/ui/button/toggle.js
-lib/firefox/modules/commonjs/sdk/ui/button/view.js
-lib/firefox/modules/commonjs/sdk/ui/button/view/events.js
-lib/firefox/modules/commonjs/sdk/ui/component.js
-lib/firefox/modules/commonjs/sdk/ui/frame.js
-lib/firefox/modules/commonjs/sdk/ui/frame/model.js
-lib/firefox/modules/commonjs/sdk/ui/frame/view.html
-lib/firefox/modules/commonjs/sdk/ui/frame/view.js
-lib/firefox/modules/commonjs/sdk/ui/id.js
-lib/firefox/modules/commonjs/sdk/ui/sidebar.js
-lib/firefox/modules/commonjs/sdk/ui/sidebar/actions.js
-lib/firefox/modules/commonjs/sdk/ui/sidebar/contract.js
-lib/firefox/modules/commonjs/sdk/ui/sidebar/namespace.js
-lib/firefox/modules/commonjs/sdk/ui/sidebar/utils.js
-lib/firefox/modules/commonjs/sdk/ui/sidebar/view.js
-lib/firefox/modules/commonjs/sdk/ui/state.js
-lib/firefox/modules/commonjs/sdk/ui/state/events.js
-lib/firefox/modules/commonjs/sdk/ui/toolbar.js
-lib/firefox/modules/commonjs/sdk/ui/toolbar/model.js
-lib/firefox/modules/commonjs/sdk/ui/toolbar/view.js
-lib/firefox/modules/commonjs/sdk/uri/resource.js
-lib/firefox/modules/commonjs/sdk/url.js
-lib/firefox/modules/commonjs/sdk/url/utils.js
-lib/firefox/modules/commonjs/sdk/util/array.js
-lib/firefox/modules/commonjs/sdk/util/collection.js
-lib/firefox/modules/commonjs/sdk/util/contract.js
-lib/firefox/modules/commonjs/sdk/util/deprecate.js
-lib/firefox/modules/commonjs/sdk/util/dispatcher.js
-lib/firefox/modules/commonjs/sdk/util/list.js
-lib/firefox/modules/commonjs/sdk/util/match-pattern.js
-lib/firefox/modules/commonjs/sdk/util/object.js
-lib/firefox/modules/commonjs/sdk/util/rules.js
-lib/firefox/modules/commonjs/sdk/util/sequence.js
-lib/firefox/modules/commonjs/sdk/util/uuid.js
-lib/firefox/modules/commonjs/sdk/view/core.js
-lib/firefox/modules/commonjs/sdk/webextension.js
-lib/firefox/modules/commonjs/sdk/window/browser.js
-lib/firefox/modules/commonjs/sdk/window/events.js
-lib/firefox/modules/commonjs/sdk/window/helpers.js
-lib/firefox/modules/commonjs/sdk/window/namespace.js
-lib/firefox/modules/commonjs/sdk/window/utils.js
-lib/firefox/modules/commonjs/sdk/windows.js
-lib/firefox/modules/commonjs/sdk/windows/fennec.js
-lib/firefox/modules/commonjs/sdk/windows/firefox.js
-lib/firefox/modules/commonjs/sdk/windows/observer.js
-lib/firefox/modules/commonjs/sdk/windows/tabs-fennec.js
-lib/firefox/modules/commonjs/sdk/worker/utils.js
-lib/firefox/modules/commonjs/sdk/zip/utils.js
-lib/firefox/modules/commonjs/test.js
-lib/firefox/modules/commonjs/toolkit/loader.js
-lib/firefox/modules/commonjs/toolkit/require.js
 lib/firefox/modules/css-selector.js
 lib/firefox/modules/ctypes.jsm
 lib/firefox/modules/debug.js
@@ -4420,8 +4159,6 @@ lib/firefox/modules/reader/Readability.j
 lib/firefox/modules/reader/ReaderWorker.js
 lib/firefox/modules/reader/ReaderWorker.jsm
 lib/firefox/modules/reflect.jsm
-lib/firefox/modules/sdk/bootstrap.js
-lib/firefox/modules/sdk/system/Startup.js
 lib/firefox/modules/services-common/async.js
 lib/firefox/modules/services-common/blocklist-clients.js
 lib/firefox/modules/services-common/blocklist-updater.js
@@ -4490,16 +4227,9 @@ lib/firefox/platform.ini
 lib/firefox/plugin-container
 lib/firefox/removed-files
 lib/firefox/res/EditorOverride.css
-lib/firefox/res/ImageDocument.css
-lib/firefox/res/TopLevelImageDocument.css
-lib/firefox/res/TopLevelVideoDocument.css
 lib/firefox/res/contenteditable.css
 lib/firefox/res/designmode.css
 lib/firefox/res/dtd/htmlmathml-f.ent
-lib/firefox/res/entityTables/html40Latin1.properties
-lib/firefox/res/entityTables/html40Special.properties
-lib/firefox/res/entityTables/html40Symbols.properties
-lib/firefox/res/entityTables/mathml20.properties
 lib/firefox/res/fonts/mathfont.properties
 lib/firefox/res/fonts/mathfontSTIXGeneral.properties
 lib/firefox/res/fonts/mathfontUnicode.properties

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.300 pkgsrc/www/firefox/distinfo:1.301
--- pkgsrc/www/firefox/distinfo:1.300   Fri Nov  3 22:07:27 2017
+++ pkgsrc/www/firefox/distinfo Thu Nov 16 01:04:38 2017
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.300 2017/11/03 22:07:27 ryoon Exp $
+$NetBSD: distinfo,v 1.301 2017/11/16 01:04:38 ryoon Exp $
 
-SHA1 (firefox-56.0.2.source.tar.xz) = 1b7310adea833a7c74498505f1207416690c9748
-RMD160 (firefox-56.0.2.source.tar.xz) = 7bd0f871aab8dea2a76b98d8b5260b5fa3082808
-SHA512 (firefox-56.0.2.source.tar.xz) = 35f81e8163a254b7e134fc073acbcff63aa1025b9c6392377650a8f2d0a5f0c77211adb0ae3d8ac85f036bb387246934b8847f14a03fceb7fcbc5b3cf94c9392
-Size (firefox-56.0.2.source.tar.xz) = 255658916 bytes
+SHA1 (firefox-57.0.source.tar.xz) = ce4fb33c451a2fbd0ed24d5f4b2c3c2e4ea22f33
+RMD160 (firefox-57.0.source.tar.xz) = 0b2e875c7ccb67652fd5714d962be7a45d02fd32
+SHA512 (firefox-57.0.source.tar.xz) = bd99ff97a2a6f824e6fbd36fd00193903159e309506b1e6945dcbc43a17a95aaa54a05f32131c56872e8860878ba6063008667955550f03aa8c7084f834d14fc
+Size (firefox-57.0.source.tar.xz) = 250728772 bytes
 SHA1 (patch-aa) = a2b7c767773f462452701237b2b06c9a4f01d1b5
 SHA1 (patch-build_gyp.mozbuild) = bb3a2f8c1cad0e9cfdaefa721c5992cba2e2bf50
 SHA1 (patch-build_moz.configure_init.configure) = 5ec8da6b5aad7682a88b010a99e19f5d4403e6db
 SHA1 (patch-build_moz.configure_keyfiles.configure) = 4d346c6298e08853681aac018f9289190bc1841a
-SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6
+SHA1 (patch-build_moz.configure_memory.configure) = 9fd2e46440733aeca8dd81b7aa26e9a4029eb956
 SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697
 SHA1 (patch-config_Makefile.in) = 2ad29cef869171aa29b6c3e4ba4a5c99311e0742
 SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136
@@ -48,14 +48,9 @@ SHA1 (patch-js_src_build_moz.build) = 45
 SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 97a221c76593be712f670aa409f2f1ad5dc20628
-SHA1 (patch-layout_style_ServoBindingList.h) = 5f30fd7a44e39a3b584f906bfc7f0b65d609a605
-SHA1 (patch-layout_style_ServoBindingTypes.h) = 3f10b0b9c49029cf494dd691825372ffb769ec58
-SHA1 (patch-layout_style_ServoBindings.h) = e3a308625b4f690133fea25591e95c29d40a9faa
-SHA1 (patch-layout_style_ServoBindings.toml) = c1675a75a52307f9e033839ae4fae28a0ced1aa9
 SHA1 (patch-media_libcubeb_gtest_moz.build) = ebb4be6e6bca4a0ed6858516ec9fdb7828bbe2e1
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = b19e380278ca875600e49b76021b20f1f9e81980
-SHA1 (patch-media_libcubeb_src_cubeb__jack.cpp) = 1b514a97e3c15d03acdc873d23ff665112984293
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 88cdfb9b9aa8c2607ca79bfa7fce4353e65638f7
 SHA1 (patch-media_libcubeb_src_moz.build) = 5fca6701cc890120a04483f52c25242ee7b1c051
 SHA1 (patch-media_libcubeb_update.sh) = e8babe57ea7f0f32658b391e9c4f6310e57fc38c
@@ -76,57 +71,12 @@ SHA1 (patch-mozglue_build_arm.h) = 5e272
 SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
 SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 8ba57212adca077fb5cfa50d752a97b0e3becc6d
 SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = 08f3a347745b5529749328ad3a070fb78a75c1e9
-SHA1 (patch-servo_Cargo.lock) = 6a9f65467263f2309706d821d888651b4f98943f
-SHA1 (patch-servo_components_devtools_lib.rs) = c20fb0907ef863b60ec8b4e7a70a745717e8da07
-SHA1 (patch-servo_components_layout_animation.rs) = eace4e2cc01c0f56ea3101d2add91f2ce4444f93
-SHA1 (patch-servo_components_layout_construct.rs) = 69b15cbc22fad1de93bbb1c262619bfd6b1fa8fa
-SHA1 (patch-servo_components_layout_display__list__builder.rs) = c48b367fe704ee5cc39afdd819fd8638261abcf8
-SHA1 (patch-servo_components_layout_flex.rs) = 2a692a5e80c7383e7266c23a9efe7ce8c637b6f2
-SHA1 (patch-servo_components_layout_inline.rs) = 9dc6a4a5e0090c1acec49531566ee1fad49f9c77
-SHA1 (patch-servo_components_layout_sequential.rs) = 3a3e685547ab65c6e87f59c4a5e21c95e4605811
-SHA1 (patch-servo_components_layout_table__cell.rs) = b1175887c47d2f9a4e7bff1e7caf34fedcedef2f
-SHA1 (patch-servo_components_layout_text.rs) = 72bd50cfd977450ae1e22e7cf82b0f979e33ff3b
-SHA1 (patch-servo_components_net_cookie__storage.rs) = b9581e6c15677b8d9456a9aec22bf86f752731f9
-SHA1 (patch-servo_components_profile_heartbeats.rs) = a119218ef6a4eb66487781bdd959a7ef0a564d73
-SHA1 (patch-servo_components_script__plugins_unrooted__must__root.rs) = 7a837c7ef70aef297a5257fa229acf2a88f0b3f9
-SHA1 (patch-servo_components_script_dom_bindings_js.rs) = 27afe3ed74c058de66cffccc388493db980b1811
-SHA1 (patch-servo_components_script_dom_cssstyledeclaration.rs) = abe9bb5d98ceff868e18fbcb981243ed8f0fc641
-SHA1 (patch-servo_components_script_dom_cssstylerule.rs) = 5ac6a76b4a6965a8b3e77ca1d8cd4bc2fd2f7582
-SHA1 (patch-servo_components_script_dom_document.rs) = ae12fa6e0e900ac1e35b412aae4c54a30a955c78
-SHA1 (patch-servo_components_script_dom_medialist.rs) = 1093cd2a661923952de825ce02ebb58764dcec34
-SHA1 (patch-servo_components_script_dom_range.rs) = 14458d0477623850259bf6cb8e832994d1255c1e
-SHA1 (patch-servo_components_script_dom_servoparser_async__html.rs) = 41f57e1e03be18d9ba2db693e6f5dd223324c7bf
-SHA1 (patch-servo_components_script_dom_url.rs) = 91f420421b9dcab3b9a9a6c08e18d36d6222779b
-SHA1 (patch-servo_components_script_dom_vrdisplay.rs) = cbff0dec0ef5a1a24aed76dfd213b548162ef017
-SHA1 (patch-servo_components_script_dom_webglrenderingcontext.rs) = 5cf56d3295c3d5f823e64da9a1248e9e25489e8a
-SHA1 (patch-servo_components_script_dom_xmlhttprequest.rs) = a4c26e854aa2ca7032d28380bd60157202895acd
-SHA1 (patch-servo_components_script_lib.rs) = 127e5c0ca8de489ca56ef4a578faccce89b6daa0
-SHA1 (patch-servo_components_selectors_matching.rs) = d5f1912ecc7591ef27e8b41965984e79a85b862f
-SHA1 (patch-servo_components_selectors_parser.rs) = 61b7cfcb3e4519886f72123aa1a5f0ebae0cf896
 SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632
-SHA1 (patch-servo_components_style_gecko__bindings_sugar_ns__t__array.rs) = 5f413c476443420ac2e6bb43d256793739421980
-SHA1 (patch-servo_components_style_gecko_conversions.rs) = 8da244d315fe7b0477d601083622ce7d5f9453fc
-SHA1 (patch-servo_components_style_gecko_generated_bindings.rs) = aa244497e54ffee7904bfebbad24b8eca12ebeff
-SHA1 (patch-servo_components_style_gecko_wrapper.rs) = 37dc203204578b0d2e776ad4d6b66c3554ec9876
-SHA1 (patch-servo_components_style_invalidation_element_invalidator.rs) = a2abed736fa311201d6f0ef3ad9b2b82fd4c93b4
-SHA1 (patch-servo_components_style_matching.rs) = beec15440f1d8aa0c6a2ff5e45a4825d502097d4
-SHA1 (patch-servo_components_style_properties_gecko.mako.rs) = a653c701cf92e37f5e4fd9f30756a316c93994b1
-SHA1 (patch-servo_components_style_properties_properties.mako.rs) = e3c40e527b60c2112a9b2c5139b2eb0053841c20
-SHA1 (patch-servo_components_style_style__adjuster.rs) = 4fa07ba093cbe8472dd4ea8406d99ddd8ade0250
-SHA1 (patch-servo_components_style_style__resolver.rs) = 2ae238f2498922ed032df54f82d93cc9c8f4b3eb
-SHA1 (patch-servo_components_style_stylesheets_rule__list.rs) = 6f6edea8b79122baf77afd1ddfcf6b4afd19a505
-SHA1 (patch-servo_components_style_stylesheets_rule__parser.rs) = 97298c34781e126d43ef5db229f5665013a9a59d
-SHA1 (patch-servo_components_style_stylesheets_rules__iterator.rs) = ae366280676f6f3df85d158334a41771686262bf
-SHA1 (patch-servo_components_style_values_specified_image.rs) = 8c13e3402902425ff1a5dac7f06d78115cea4bf5
-SHA1 (patch-servo_components_webdriver__server_lib.rs) = af2dbc95cfc3d19d3ec5bf613507700a58f275d1
-SHA1 (patch-servo_ports_geckolib_glue.rs) = a6f63947d27c657aa9c9371dabef89000758e6dc
-SHA1 (patch-servo_rust-commit-hash) = 17078828535bb3ecc029e0c337438507b7d52bf4
-SHA1 (patch-servo_tests_unit_style_stylist.rs) = b6ce7a199519a898b7392f27d517e18050804056
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
 SHA1 (patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h) = 0730c0c5d8e0865aa8a2f311b27559a3f6793a52
 SHA1 (patch-toolkit_library_moz.build) = 34e757ad08ebaee1cbc69993ec0f6774d41a14a2
-SHA1 (patch-toolkit_moz.configure) = 274ad8d6957a09d3527bdbb0d86c36f6c24104d9
+SHA1 (patch-toolkit_moz.configure) = 3dd9df2ac5c3f942b7f2616c2fae6bd36d3437e7
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.100 pkgsrc/www/firefox/mozilla-common.mk:1.101
--- pkgsrc/www/firefox/mozilla-common.mk:1.100  Sun Oct 29 09:47:57 2017
+++ pkgsrc/www/firefox/mozilla-common.mk        Thu Nov 16 01:04:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.100 2017/10/29 09:47:57 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.101 2017/11/16 01:04:38 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -71,7 +71,6 @@ CONFIGURE_ARGS+=      --disable-libjpeg-turbo
 CONFIGURE_ARGS+=       --disable-elf-hack
 CONFIGURE_ARGS+=       --disable-gconf
 #CONFIGURE_ARGS+=      --enable-readline
-CONFIGURE_ARGS+=       --enable-url-classifier
 CONFIGURE_ARGS+=       --disable-icf
 CONFIGURE_ARGS+=       --disable-updater
 

Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure
diff -u pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure:1.1 pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure:1.2
--- pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure:1.1   Thu Feb 16 02:25:17 2017
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_memory.configure       Thu Nov 16 01:04:38 2017
@@ -1,15 +1,15 @@
-$NetBSD: patch-build_moz.configure_memory.configure,v 1.1 2017/02/16 02:25:17 maya Exp $
+$NetBSD: patch-build_moz.configure_memory.configure,v 1.2 2017/11/16 01:04:38 ryoon Exp $
 
 Recognise DragonflyBSD
 
---- build/moz.configure/memory.configure.orig  2017-01-16 16:16:51.000000000 +0000
+--- build/moz.configure/memory.configure.orig  2017-09-15 04:15:39.000000000 +0000
 +++ build/moz.configure/memory.configure
-@@ -66,7 +66,7 @@ def jemalloc_os_define(jemalloc, jemallo
-             return 'MOZ_MEMORY_LINUX'
-         if target.kernel == 'Darwin':
-             return 'MOZ_MEMORY_DARWIN'
--        if target.kernel in ('kFreeBSD', 'FreeBSD', 'NetBSD'):
-+        if target.kernel in ('kFreeBSD', 'FreeBSD', 'NetBSD', 'DragonFly'):
-             return 'MOZ_MEMORY_BSD'
+@@ -32,7 +32,7 @@ def jemalloc(value, target, build_projec
+         return True
+ 
+     if value and target.kernel not in ('WINNT', 'Linux', 'Darwin', 'kFreeBSD',
+-                                       'FreeBSD', 'NetBSD'):
++                                       'FreeBSD', 'NetBSD', 'DragonFly'):
          die('--enable-jemalloc is not supported on %s', target.kernel)
  
+ 

Index: pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
diff -u pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.6 pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.7
--- pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.6  Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_moz.configure      Thu Nov 16 01:04:38 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.6 2017/09/30 05:34:12 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.7 2017/11/16 01:04:38 ryoon Exp $
 
 * skia part: support bigendian architectures
 
---- toolkit/moz.configure.orig 2017-09-14 20:16:01.000000000 +0000
+--- toolkit/moz.configure.orig 2017-09-15 04:15:40.000000000 +0000
 +++ toolkit/moz.configure
-@@ -314,6 +314,26 @@ def freetype2_combined_info(fontconfig_i
+@@ -317,6 +317,26 @@ def freetype2_combined_info(fontconfig_i
  add_old_configure_assignment('_HAVE_FREETYPE2',
                               depends_if(freetype2_info)(lambda _: True))
  
@@ -31,16 +31,7 @@ $NetBSD: patch-toolkit_moz.configure,v 1
  # Apple platform decoder support
  # ==============================================================
  @depends(toolkit)
-@@ -600,7 +620,7 @@ def stylo_config(value, _, target):
- 
-     # If nothing is specified, default to building stylo where possible.
-     if value.origin == 'default':
--        if target.os == 'GNU' and target.bitness == 32:
-+        if target.os != 'WINNT' and target.bitness == 32:
-             # The clang setup we use in automation is a little unusual, and
-             # doesn't play well with bindgen on 32-bit Linux.
-             pass
-@@ -1047,11 +1067,11 @@ add_old_configure_assignment('NECKO_PROT
+@@ -940,11 +960,11 @@ include('nss.configure')
  # ==============================================================
  option('--disable-skia', help='Disable use of Skia')