Merge inbound to mozilla-central. a=merge

browser/base/content/test/keyboard/browser.ini

@@ -3,4 +3,5 @@ support-files = head.js
 
 [browser_toolbarButtonKeyPress.js]
 [browser_toolbarKeyNav.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateRegistration(unsigned long, mozilla::dom::ServiceWorkerRegistrationData&)
 support-files = !/browser/base/content/test/permissions/permissions.html

browser/base/content/test/permissions/browser.ini

@@ -6,16 +6,21 @@ support-files=
 [browser_canvas_fingerprinting_resistance.js]
 skip-if = debug || os == "linux" && asan # Bug 1522069
 [browser_permissions.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_permissions_event_telemetry.js]
+skip-if = fission && debug
 [browser_permissions_postPrompt.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 support-files=
   dummy.js
 [browser_permissions_handling_user_input.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateRegistration(unsigned long, mozilla::dom::ServiceWorkerRegistrationData&)
 support-files=
   dummy.js
 [browser_reservedkey.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_temporary_permissions.js]
-fail-if = fission # SecurityError: Permission denied to access property "document" on cross-origin object
+fail-if = fission
 support-files =
   temporary_permissions_subframe.html
   ../webrtc/get_user_media.html
@@ -27,5 +32,6 @@ support-files =
   ../general/audio.ogg
 skip-if = verify && os == 'linux' && debug # Bug 1483648
 [browser_temporary_permissions_expiry.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_temporary_permissions_navigation.js]
 [browser_temporary_permissions_tabs.js]

dom/serviceworkers/test/browser.ini

@@ -20,21 +20,28 @@ support-files =
 
 [browser_antitracking.js]
 [browser_antitracking_subiframes.js]
+skip-if = fission
 [browser_devtools_serviceworker_interception.js]
 skip-if =
   serviceworker_e10s ||
-  fission && debug # Causes shutdown crashes under Fission. Assertion failure: parentFound
+  fission && debug # Causes shutdown crashes under Fission.
 [browser_force_refresh.js]
 skip-if = fission
 [browser_download.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_download_canceled.js]
-skip-if = verify
+skip-if = verify || (fission && debug) # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_navigation_process_swap.js]
 skip-if = fission || !e10s || verify # Bug 1548643
 [browser_storage_permission.js]
-skip-if = verify && debug && (os == 'win' || os == 'mac'))
+skip-if =
+  (verify && debug && (os == 'win' || os == 'mac')) ||
+  fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_storage_recovery.js]
 skip-if = fission || serviceworker_e10s # Fails intermittently under Fission
 [browser_unregister_with_containers.js]
+skip-if = fission && debug # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)
 [browser_userContextId_openWindow.js]
-skip-if = !e10s || serviceworker_e10s
+skip-if =
+  !e10s || serviceworker_e10s ||
+  (fission && debug) # Crashes: @ mozilla::dom::ServiceWorkerManagerService::PropagateUnregister(unsigned long, mozilla::ipc::PrincipalInfo const&, nsTSubstring<char16_t> const&)

testing/geckodriver/doc/ARM.md

@@ -35,5 +35,5 @@ cross-compile ARMv7 from a Linux host system is as follows:
          % cd testing/geckodriver
          % cargo build --release --target armv7-unknown-linux-gnueabihf
 
-[announce the intent]: https://lists.mozilla.org/pipermail/tools-marionette/2018-September/000035.html
+[announced the intent]: https://lists.mozilla.org/pipermail/tools-marionette/2018-September/000035.html
 [central]: https://hg.mozilla.org/mozilla-central/

testing/geckodriver/doc/Capabilities.md

@@ -29,20 +29,19 @@ started and run. It may contain any of the following fields:
   <td><code>binary</code>
   <td align="center">string
   <td><p>
-   Absolute path of the Firefox binary
-   to select which custom browser binary to use.
+   Path to the Firefox executable to select which custom browser binary to use.
    If left undefined geckodriver will attempt
-   to deduce the default location of Firefox
-   on the current system. If Firefox stable is
-   not installed, it will suggest the default
-   location of Firefox Nightly instead.
+   to deduce the default location of Firefox on the current system.
+   If Firefox stable is not installed, it will suggest
+   the default location of Firefox Nightly instead.
 
-   <p>
-   On macOS the path must be absolute to the browser binary,
-   e.g. <code>/Applications/Firefox.app/Contents/MacOS/firefox</code> or,
-   in case of Nightly, <code>/Applications/Firefox Nightly.app/Contents/MacOS/firefox</code>
-   Specifying an application bundle such as <code>/Applications/Firefox.app</code>
-   or <code>/Applications/Firefox Nightly.app</code> will <em>not</em> work.
+  <p>
+  On macOS the path can either be for the application bundle,
+  e.g. <code>/Applications/Firefox.app</code>
+  or <code>/Applications/Firefox Nightly.app</code>,
+  or point at the executable absolute path inside the bundle,
+  e.g. <code>/Applications/Firefox.app/Contents/MacOS/firefox</code>
+  or <code>/Applications/Firefox Nightly.app/Contents/MacOS/firefox</code>.
  </tr>
 
  <tr id=capability-args>