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

- Bug 1192101 - Part 1 - Support PresentationRequest / PresentationAvailability / getSession(s). Part 1 - WebIDL Bindings. r=smaug (966c9ef0cc)
- Bug 1192101 - Part 2 - Support PresentationRequest / PresentationAvailability / getSession(s). Part 2 - Change notification & event dispatching. r=smaug (884dc29bbf)
- Bug 1192101 - Part 3 - Support PresentationRequest / PresentationAvailability / getSession(s). Part 3 - Adjust errors. r=smaug (deff3602fb)
- Bug 1201805 - [Presentation WebAPI] Fix collaboration issues with control channel. Part 2 - Adjust the timing to send offer. r=smaug (12fd6daaf6)
- Bug 1192101 - Part 4 -Support PresentationRequest / PresentationAvailability / getSession(s). Part 4 - Rename PresentationSessionInfo relevant classes. r=smaug (426ecdf6bc)
- Bug 1202582 - Part 2 - [Presentation WebAPI] Ensure incoming messages are well delivered to receiver pages. Part 2 - PresentationSessionInfo. r=smaug (8063fb8b0c)
- Bug 1202582 - Part 1 - Presentation WebAPI] Ensure incoming messages are well delivered to receiver pages. Part 1 - PresentationSessionTransport. r=jdm (4557d46a69)
- Bug 1192101 - Part 5 - Support PresentationRequest / PresentationAvailability / getSession(s). Part 5 - Tests. r=smaug (09ed937625)
-  Bg 950660: Part 1: Support bind in TCPSocket from content process r=jdm (a4c5a6e59d)
- Bug 950660: Part 1: Support bind in TCPSocket from content process r=jdm Bug 950660: Part 2 - Change TCPSocket interface to TCPSocketChild and unbitrot r=jdm Bug 950660: Part 3 - make TCPSocket/TCPSocketChild interface an IDL interface r=jdm (4694a7afa8)
- Bug 885982 - Part 4: Remove all traces of JS implementation. r=asuth (0b4308ac2b)
- Bug 1171760: P6. Use MediaSourceSamples logging in ContainerParser. r=cpearce (83abe7a45f)
- Bug 1186257 - Fix formatting. r=jya (33715d7cd7)
- Bug 1171760: P5. Add MediaSourceSamples logging. r=cpearce (5ebfc707ec)
- Bug 1197563 - Polyfill __func__ for MSVC 2013 and earlier. r=froydnj (c5d0f4edde)
- Bug 1186257 - Use default dtor in ContainerParser. r=jya (270678ff2a)
- Bug 1188150 - Move ContainerParser dtor to implementation. r=jya (67ece68407)
- Bug 1183196: [MSE] P3. Slightly increase debugging information. r=kentuckyfriedtakahe (dbc73818a3)
- fix spacing (7407c57db7)

dom/filesystem/DeviceStorageFileSystem.cpp

@@ -16,6 +16,7 @@
 #include "nsDeviceStorage.h"
 #include "nsIFile.h"
 #include "nsPIDOMWindow.h"
+#include "nsGlobalWindow.h"
 
 namespace mozilla {
 namespace dom {
@@ -23,7 +24,7 @@ namespace dom {
 DeviceStorageFileSystem::DeviceStorageFileSystem(
   const nsAString& aStorageType,
   const nsAString& aStorageName)
-  : mDeviceStorage(nullptr)
+  : mWindowId(0)
 {
   MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
 
@@ -76,14 +77,15 @@ DeviceStorageFileSystem::Init(nsDOMDeviceStorage* aDeviceStorage)
 {
   MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
   MOZ_ASSERT(aDeviceStorage);
-  mDeviceStorage = aDeviceStorage;
+  nsCOMPtr<nsPIDOMWindow> window = aDeviceStorage->GetOwner();
+  MOZ_ASSERT(window->IsInnerWindow());
+  mWindowId = window->WindowID();
 }
 
 void
 DeviceStorageFileSystem::Shutdown()
 {
   MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
-  mDeviceStorage = nullptr;
   mShutdown = true;
 }
 
@@ -91,10 +93,9 @@ nsPIDOMWindow*
 DeviceStorageFileSystem::GetWindow() const
 {
   MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!");
-  if (!mDeviceStorage) {
-    return nullptr;
-  }
-  return mDeviceStorage->GetOwner();
+  nsGlobalWindow* window = nsGlobalWindow::GetInnerWindowWithId(mWindowId);
+  MOZ_ASSERT_IF(!mShutdown, window);
+  return window;
 }
 
 void