1 files changed, 4 insertions, 12 deletions
diff --git a/dom/ipc/FilePickerParent.cpp b/dom/ipc/FilePickerParent.cpp
index ebd24cb0d3..ea65f79c23 100644
--- a/dom/ipc/FilePickerParent.cpp
+++ b/dom/ipc/FilePickerParent.cpp
@@ -219,25 +219,17 @@ void FilePickerParent::Done(nsIFilePicker::ResultCode aResult) {
 }
 
 bool FilePickerParent::CreateFilePicker() {
-  mFilePicker = do_CreateInstance("@mozilla.org/filepicker;1");
-  if (!mFilePicker) {
+  if (!mBrowsingContext) {
     return false;
   }
 
-  auto* browserParent = BrowserParent::GetFrom(Manager());
-  auto* browsingContext = browserParent->GetBrowsingContext();
-  Element* element = browserParent->GetOwnerElement();
-  if (!element) {
-    return false;
-  }
+  mFilePicker = do_CreateInstance("@mozilla.org/filepicker;1");
 
-  nsCOMPtr<mozIDOMWindowProxy> window = element->OwnerDoc()->GetWindow();
-  if (!window) {
+  if (!mFilePicker) {
     return false;
   }
 
-  return NS_SUCCEEDED(
-      mFilePicker->Init(window, mTitle, mMode, browsingContext));
+  return NS_SUCCEEDED(mFilePicker->Init(mBrowsingContext, mTitle, mMode));
 }
 
 mozilla::ipc::IPCResult FilePickerParent::RecvOpen(