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

- Don't upgrade gfx features after device resets. (bug 1183910 part 5, r=mattwoodrow) (e53d0f91f)
- Use the same graphics device parameters across processes. (bug 1183910 part 7, r=mattwoodrow) (083ae4f15)
- Rename DriverInitCrashDetection to DriverCrashGuard. (bug 1190281 part 2, r=mattwoodrow) (9bd189d09)
- Make DriverCrashGuard initialization lazy. (bug 1190281 part 3, r=mattwoodrow) (6821dc386)
- Pull D3D11 logic out of DriverCrashGuard. (bug 1190281 part 4, r=mattwoodrow) (e499a0079)
- Move telemetry recording into D3D11LayersCrashGuard. (bug 1190281 part 5, r=mattwoodrow) (b50a4c2b4)
- Factor prefs out of DriverCrashGuard. (bug 1190281 part 6, r=mattwoodrow) (a3a1166ab)
- Bug 1170939 - Close PBontentBridge when receving shut dwon message, r=khuey (5473d07f0)
- Allow DriverCrashGuard to be used in content processes. (bug 1190281 part 7, r=mattwoodrow) (c9eaf8315)
- Add a crash guard for DXVA2D3D9. (bug 1190281 part 8, r=mattwoodrow) (eceff5212)
- Add driver crash guards to WebGL (bug 1190281 part 9, r=jgilbert,mattwoodrow) (c362b60c6)
- Fix bogus assert in DriverCrashGuard. (bug 1190281 followup, r=mattwoodrow) (d4a7145bd)
- Bug 968923 - part 5b - add nsIDOMWindowUtils::forceUseCounterFlush; r=bz (138d30251)
- Bug 968923 - part 5c - add tests for use counters; r=bz (0c4b745e0)
- Bug 554186 - Part 1: Unimplement NPN_Status API. r=josh (8759dad40)
- Bug 554186 - Part 2: Remove unused nsPluginInstanceOwner::ShowNativeContextMenu(). r=josh (ad2ac0c4d)
- Bug 1174913 - anchor and area mochitests. r=bz (ab2c58a34)
- Bug 959992. Go back to not treating properties that the named properties object exposes as enumerable. r=peterv (0adeeb910)
- Bug 1154974 (Part 1) - Give blobs serial numbers. r=bent (4602ca2cd)
- Bug 1154974 (Part 2) - Merge image cache entries for blobs URIs with the same underlying blob. r=baku (3b64b409e)
- Bug 1173314 - Make GetMozFullPath and GetMozFullPathInternal const. r=sicking (f8eaabb1e)
- Bug 1167389 - Make FileList::mParent a smart pointer, and declare it to the cycle collector. r=ehsan (d1217e547)
- Bug 1173390 - Remove the majority of the old directory picker implementation to prepare for the new implementation under bug 1164310. r=baku (750049972)
- Bug 1164310, part 1 - Make the code for bypassing mobile security checks more general so that it can be used on non-mobile. r=baku (0486fb5ff)
- Bug 1164310, part 2 - Implement an abstraction for a rooted filesystem for non-mobile devices. r=baku (f1d906bd6)
- Bug 1164310, part 3 - Allow the DirState of blobs to be set explicitly. r=baku (13d832700)
- Bug 1164310, part 4 - Implement the new HTMLInputElement API including the new Promise returning GetFilesAndDirectories. r=baku (d0f93ec19)
- Bug 1164310, part 5 - Implement new anonymous content and layout pieces for directory picking via input elements. r=tnikkel (ac5a00781)
- Bug 1164310, part 6 - Implement the new Promise returning DataTransfer.getFilesAndDirectories() API. r=baku (375fba953)
- Bug 1164310 - Follow-up: Fix build bustage with --disable-accessibility. r=me (da0e6745b)
- Bug 1164310, part 7 - Touch CLOBBER since bug 1177844 isn't fixed yet. r=me (5fa829742)
- Bug 1185381 - Make FileList clonable - patch 1 - move code into FileList.h/.cpp, r=smaug (b85483178)
- Bug 1185381 - Make FileList clonable - patch 2 - rename FILEIMPL_IID to BLOBIMPL_IID, r=smaug (0f920cd05)
- Bug 1185360 - PostMessageEvent should not have a different behavior if the main principal subsumes the destination one., r=smaug (070ab034b)
- Bug 1185381 - Make FileList clonable - patch 3 - FileListClonedData implementation, r=smaug (f4f082d18)
-  Bug 1185381 - Make FileList clonable - patch 4 - tests, r=smaug (fb3637313)

dom/filesystem/DeviceStorageFileSystem.cpp

@@ -36,8 +36,8 @@ DeviceStorageFileSystem::DeviceStorageFileSystem(
   mString.Append('-');
   mString.Append(mStorageName);
 
-  mIsTesting =
-    mozilla::Preferences::GetBool("device.storage.prompt.testing", false);
+  mRequiresPermissionChecks =
+    !mozilla::Preferences::GetBool("device.storage.prompt.testing", false);
 
   // Get the permission name required to access the file system.
   nsresult rv =
@@ -97,45 +97,10 @@ DeviceStorageFileSystem::GetWindow() const
   return mDeviceStorage->GetOwner();
 }
 
-already_AddRefed<nsIFile>
-DeviceStorageFileSystem::GetLocalFile(const nsAString& aRealPath) const
+void
+DeviceStorageFileSystem::GetRootName(nsAString& aRetval) const
 {
-  MOZ_ASSERT(XRE_IsParentProcess(),
-             "Should be on parent process!");
-  nsAutoString localPath;
-  FileSystemUtils::NormalizedPathToLocalPath(aRealPath, localPath);
-  localPath = mLocalRootPath + localPath;
-  nsCOMPtr<nsIFile> file;
-  nsresult rv = NS_NewLocalFile(localPath, false, getter_AddRefs(file));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return nullptr;
-  }
-  return file.forget();
-}
-
-bool
-DeviceStorageFileSystem::GetRealPath(BlobImpl* aFile, nsAString& aRealPath) const
-{
-  MOZ_ASSERT(XRE_IsParentProcess(),
-             "Should be on parent process!");
-  MOZ_ASSERT(aFile, "aFile Should not be null.");
-
-  aRealPath.Truncate();
-
-  nsAutoString filePath;
-  ErrorResult rv;
-  aFile->GetMozFullPathInternal(filePath, rv);
-  if (NS_WARN_IF(rv.Failed())) {
-    return false;
-  }
-
-  return LocalPathToRealPath(filePath, aRealPath);
-}
-
-const nsAString&
-DeviceStorageFileSystem::GetRootName() const
-{
-  return mStorageName;
+  aRetval = mStorageName;
 }
 
 bool
@@ -172,19 +137,5 @@ DeviceStorageFileSystem::IsSafeDirectory(Directory* aDir) const
   return fs->ToString() == mString;
 }
 
-bool
-DeviceStorageFileSystem::LocalPathToRealPath(const nsAString& aLocalPath,
-                                             nsAString& aRealPath) const
-{
-  nsAutoString path;
-  FileSystemUtils::LocalPathToNormalizedPath(aLocalPath, path);
-  if (!FileSystemUtils::IsDescendantPath(mNormalizedLocalRootPath, path)) {
-    aRealPath.Truncate();
-    return false;
-  }
-  aRealPath = Substring(path, mNormalizedLocalRootPath.Length());
-  return true;
-}
-
 } // namespace dom
 } // namespace mozilla