Bug 1750164 - Hand over the proper unit of time from ClearDataService to PermissionManager. r=pbz

Differential Revision: https://phabricator.services.mozilla.com/D136391

browser/base/content/test/sanitize/browser_sanitize-history.js

@@ -41,7 +41,10 @@ add_task(async function sanitizeStorageAccessPermissions() {
     Services.perms.ALLOW_ACTION
   );
 
-  await Sanitizer.sanitize(["history"], { range: [timestamp, Date.now()] });
+  await Sanitizer.sanitize(["history"], {
+    // Sanitizer and ClearDataService work with time range in PRTime (microseconds)
+    range: [timestamp * 1000, Date.now() * 1000],
+  });
 
   Assert.equal(
     PermissionTestUtils.testExactPermission(

extensions/permissions/PermissionManager.cpp

@@ -2440,6 +2440,10 @@ NS_IMETHODIMP PermissionManager::GetAll(
 NS_IMETHODIMP PermissionManager::GetAllByTypeSince(
     const nsACString& aPrefix, int64_t aSince,
     nsTArray<RefPtr<nsIPermission>>& aResult) {
+  // Check that aSince is a reasonable point in time, not in the future
+  if (aSince > (PR_Now() / PR_USEC_PER_MSEC)) {
+    return NS_ERROR_INVALID_ARG;
+  }
   return GetPermissionEntries(
       [&](const PermissionEntry& aPermEntry) {
         return mTypeArray[aPermEntry.mType].Equals(aPrefix) &&

toolkit/components/cleardata/ClearDataService.jsm

@@ -838,10 +838,10 @@ const StorageAccessCleaner = {
     for (let principal of aPrincipalsWithStorage) {
       baseDomainsWithStorage.add(principal.baseDomain);
     }
-
     for (let perm of Services.perms.getAllByTypeSince(
       "storageAccessAPI",
-      aFrom
+      // The permission manager uses milliseconds instead of microseconds
+      aFrom / 1000
     )) {
       if (!baseDomainsWithStorage.has(perm.principal.baseDomain)) {
         Services.perms.removePermission(perm);

toolkit/components/cleardata/tests/unit/test_storage_permission.js

@@ -364,7 +364,8 @@ add_task(async function test_deleteUserInteractionForClearingHistory() {
   await new Promise(resolve => {
     return Services.clearData.deleteUserInteractionForClearingHistory(
       [principalWithStorage],
-      timestamp,
+      // ClearDataService takes PRTime (microseconds)
+      timestamp * 1000,
       resolve
     );
   });