import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1237091. Remove WAP telemetry probe. r=mcmanus (8538288c45)
- bug 718797 - allow heuristic cache of query string resources r=hurley (df7c0d050c)
- Bug 1238290 - fix bad necko deps on unified_sources r=valentin.gosu (fee60661f9)
- Bug 1237371: Asynchronously shutdown the predictor IO thread. r=hurley (2b971d9714)
- Bug 407537 - Dont normalize a nonexistant file r=biesi (e9d4b81b0f)
- Bug 1247733 part 1: Create a helper function for nsStandardURL's code to add/remove/replace a port in the URL string. r=valentin (81db1064a1)
- Bug 1247733 part 2: Give nsIStandardURL an API to set its default port, and use it when upgrading HTTP connections to HTTPS. r=valentin (de4ee7a9c3)
- Bug 1247733 part 3: Add mochitest to ensure that SVG <use> is rendered correctly in documents that have been upgraded using HSTS. r=valentin (a929b68f0c)
- Bug 1247733 part 4: Add xpcshell test for nsIStandardURL setDefaultPot() API. r=valentin (4599dc1a46)
- Bug 524232 - cache about: protocol handlers r=mayhemer (7ac918c396)
- Bug 1238010 - Turn off ClosingService. r=mcmanus (e46aa99310)
- Bug 1238017 - Remove ClosingService. r=mcmanus (c5d027507b)
- Bug 1238910 - Rework shutdown necko. r=mcmanus (c95508d202)
- Bug 1240269 - Do not open UDP socket during shutdown. r=mcmanus (e62a2008b5)
- Bug 1240481 - Limit PR_Close calls during shutdown. r=mcmanus (aa3d4bd35c)
- Bug 1242755 - Move nsHttpConnectionMgr->Shutdown back to nsHttpHandler. r=mcmanus (a630e3baf7)
- add webapps (1b90fe85a8)
- bug 1069556 - sync to Breakpad c53ed143108948eb7e2d7ee77dc8c0d92050ce7c. r=glandium, benwa (e0608cc38b)
- more work to add pdfjs (ef88fb0b25)
- var-let (df1123752d)
- Bug 1242254 - Enable initial set of eslint rules for PSM. r=dkeeler (f68806c68d)

python/mozbuild/mozpack/test/test_chrome_manifest.py

@@ -39,6 +39,7 @@ class TestManifest(unittest.TestCase):
             'skin global classic/1.0 content/skin/classic/ application=foo' +
             ' os=WINNT',
             '',
+            'manifest pdfjs/chrome.manifest',
             'resource gre-resources toolkit/res/',
             'override chrome://global/locale/netError.dtd' +
             ' chrome://browser/locale/netError.dtd',
@@ -69,6 +70,7 @@ class TestManifest(unittest.TestCase):
             ManifestSkin('', 'global', 'classic/1.0', 'content/skin/classic/'),
             ManifestSkin('', 'global', 'classic/1.0', 'content/skin/classic/',
                          'application=foo', 'os=WINNT'),
+            Manifest('', 'pdfjs/chrome.manifest'),
             ManifestResource('', 'gre-resources', 'toolkit/res/'),
             ManifestOverride('', 'chrome://global/locale/netError.dtd',
                              'chrome://browser/locale/netError.dtd'),

python/mozbuild/mozpack/test/test_files.py

@@ -625,6 +625,8 @@ class TestManifestFile(TestWithTmpDir):
         f = ManifestFile('chrome')
         f.add(ManifestContent('chrome', 'global', 'toolkit/content/global/'))
         f.add(ManifestResource('chrome', 'gre-resources', 'toolkit/res/'))
+        f.add(ManifestResource('chrome/pdfjs', 'pdfjs', './'))
+        f.add(ManifestContent('chrome/pdfjs', 'pdfjs', 'pdfjs'))
         f.add(ManifestLocale('chrome', 'browser', 'en-US',
                              'en-US/locale/browser/'))
 
@@ -632,6 +634,8 @@ class TestManifestFile(TestWithTmpDir):
         self.assertEqual(open(self.tmppath('chrome.manifest')).readlines(), [
             'content global toolkit/content/global/\n',
             'resource gre-resources toolkit/res/\n',
+            'resource pdfjs pdfjs/\n',
+            'content pdfjs pdfjs/pdfjs\n',
             'locale browser en-US en-US/locale/browser/\n',
         ])