Merge mozilla-inbound to mozilla-central. a=merge

js/src/ds/Bitmap.cpp

@@ -8,6 +8,8 @@
 
 #include <algorithm>
 
+#include "js/UniquePtr.h"
+
 using namespace js;
 
 SparseBitmap::~SparseBitmap()
@@ -27,15 +29,25 @@ SparseBitmap::sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf)
     return size;
 }
 
+SparseBitmap::BitBlock*
+SparseBitmap::createBlock(Data::AddPtr p, size_t blockId)
+{
+    MOZ_ASSERT(!p);
+    auto block = js::MakeUnique<BitBlock>();
+    if (!block || !data.add(p, blockId, block.get())) {
+        return nullptr;
+    }
+    std::fill(block->begin(), block->end(), 0);
+    return block.release();
+}
+
 SparseBitmap::BitBlock&
 SparseBitmap::createBlock(Data::AddPtr p, size_t blockId, AutoEnterOOMUnsafeRegion& oomUnsafe)
 {
-    MOZ_ASSERT(!p);
-    BitBlock* block = js_new<BitBlock>();
-    if (!block || !data.add(p, blockId, block)) {
+    BitBlock* block = createBlock(p, blockId);
+    if (!block) {
         oomUnsafe.crash("Bitmap OOM");
     }
-    std::fill(block->begin(), block->end(), 0);
     return *block;
 }
 

js/src/ds/Bitmap.h

@@ -91,6 +91,8 @@ class SparseBitmap
 
     BitBlock& createBlock(Data::AddPtr p, size_t blockId, AutoEnterOOMUnsafeRegion& oomUnsafe);
 
+    BitBlock* createBlock(Data::AddPtr p, size_t blockId);
+
     MOZ_ALWAYS_INLINE BitBlock* getBlock(size_t blockId) const {
         Data::Ptr p = data.lookup(blockId);
         return p ? p->value() : nullptr;
@@ -107,6 +109,14 @@ class SparseBitmap
         return createBlock(p, blockId, oomUnsafe);
     }
 
+    MOZ_ALWAYS_INLINE BitBlock* getOrCreateBlockFallible(size_t blockId) {
+        Data::AddPtr p = data.lookupForAdd(blockId);
+        if (p) {
+            return p->value();
+        }
+        return createBlock(p, blockId);
+    }
+
   public:
     ~SparseBitmap();
 
@@ -119,6 +129,17 @@ class SparseBitmap
         block[word - blockWord] |= uintptr_t(1) << (bit % JS_BITS_PER_WORD);
     }
 
+    MOZ_ALWAYS_INLINE bool setBitFallible(size_t bit) {
+        size_t word = bit / JS_BITS_PER_WORD;
+        size_t blockWord = blockStartWord(word);
+        BitBlock* block = getOrCreateBlockFallible(blockWord / WordsInBlock);
+        if (!block) {
+            return false;
+        }
+        (*block)[word - blockWord] |= uintptr_t(1) << (bit % JS_BITS_PER_WORD);
+        return true;
+    }
+
     bool getBit(size_t bit) const;
 
     void bitwiseAndWith(const DenseBitmap& other);

js/src/gc/AtomMarking-inl.h

@@ -6,6 +6,7 @@
 
 #include "gc/AtomMarking.h"
 
+#include "mozilla/Assertions.h"
 #include "vm/Realm.h"
 
 #include "gc/Heap-inl.h"
@@ -34,9 +35,9 @@ ThingIsPermanent(JS::Symbol* symbol)
     return symbol->isWellKnownSymbol();
 }
 
-template <typename T>
-MOZ_ALWAYS_INLINE void
-AtomMarkingRuntime::inlinedMarkAtom(JSContext* cx, T* thing)
+template <typename T, bool Fallible>
+MOZ_ALWAYS_INLINE bool
+AtomMarkingRuntime::inlinedMarkAtomInternal(JSContext* cx, T* thing)
 {
     static_assert(mozilla::IsSame<T, JSAtom>::value ||
                   mozilla::IsSame<T, JS::Symbol>::value,
@@ -48,18 +49,24 @@ AtomMarkingRuntime::inlinedMarkAtom(JSContext* cx, T* thing)
 
     // The context's zone will be null during initialization of the runtime.
     if (!cx->zone()) {
-        return;
+        return true;
     }
     MOZ_ASSERT(!cx->zone()->isAtomsZone());
 
     if (ThingIsPermanent(thing)) {
-        return;
+        return true;
     }
 
     size_t bit = GetAtomBit(cell);
     MOZ_ASSERT(bit / JS_BITS_PER_WORD < allocatedWords);
 
-    cx->zone()->markedAtoms().setBit(bit);
+    if (Fallible) {
+        if (!cx->zone()->markedAtoms().setBitFallible(bit)) {
+            return false;
+        }
+    } else {
+        cx->zone()->markedAtoms().setBit(bit);
+    }
 
     if (!cx->helperThread()) {
         // Trigger a read barrier on the atom, in case there is an incremental
@@ -73,6 +80,22 @@ AtomMarkingRuntime::inlinedMarkAtom(JSContext* cx, T* thing)
     // We don't have a JSTracer for this so manually handle the cases in which
     // an atom can reference other atoms.
     markChildren(cx, thing);
+
+    return true;
+}
+
+template <typename T>
+MOZ_ALWAYS_INLINE void
+AtomMarkingRuntime::inlinedMarkAtom(JSContext* cx, T* thing)
+{
+    MOZ_ALWAYS_TRUE((inlinedMarkAtomInternal<T, false>(cx, thing)));
+}
+
+template <typename T>
+MOZ_ALWAYS_INLINE bool
+AtomMarkingRuntime::inlinedMarkAtomFallible(JSContext* cx, T* thing)
+{
+    return inlinedMarkAtomInternal<T, true>(cx, thing);
 }
 
 } // namespace gc

js/src/gc/AtomMarking.h

@@ -66,7 +66,10 @@ class AtomMarkingRuntime
 
     // Version of markAtom that's always inlined, for performance-sensitive
     // callers.
+    template <typename T, bool Fallible>
+    MOZ_ALWAYS_INLINE bool inlinedMarkAtomInternal(JSContext* cx, T* thing);
     template <typename T> MOZ_ALWAYS_INLINE void inlinedMarkAtom(JSContext* cx, T* thing);
+    template <typename T> MOZ_ALWAYS_INLINE bool inlinedMarkAtomFallible(JSContext* cx, T* thing);
 
     void markId(JSContext* cx, jsid id);
     void markAtomValue(JSContext* cx, const Value& value);

js/src/vm/JSAtom.cpp

@@ -738,7 +738,10 @@ AtomizeAndCopyCharsFromLookup(JSContext* cx, const CharT* tbchars, size_t length
         return nullptr;
     }
 
-    cx->atomMarking().inlinedMarkAtom(cx, atom);
+    if (MOZ_UNLIKELY(!cx->atomMarking().inlinedMarkAtomFallible(cx, atom))) {
+        ReportOutOfMemory(cx);
+        return nullptr;
+    }
 
     if (zonePtr &&
         MOZ_UNLIKELY(!zone->atomCache().add(*zonePtr, AtomStateEntry(atom, false))))

taskcluster/ci/test/reftest.yml

@@ -69,7 +69,7 @@ jsreftest:
     chunks:
         by-test-platform:
             android-em-4.3-arm7-api-16/debug: 100
-            android-em-7.0-x86/opt: 3
+            android-em-7.0-x86/opt: 4
             android-em.*: 40
             windows.*: 2
             windows10-64-ccov/debug: 5

testing/web-platform/meta/background-fetch/fetch-uploads.https.window.js.ini

@@ -0,0 +1,4 @@
+[fetch-uploads.https.window.html]
+  [Fetch with an upload should work]
+    expected: FAIL
+

testing/web-platform/meta/cookies/samesite/form-post-blank-reload.html.ini

@@ -10,12 +10,15 @@
   [Reloaded same-host top-level form POSTs are strictly same-site]
     expected:
       if os == "android": TIMEOUT
+      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
 
   [Reloaded subdomain top-level form POSTs are strictly same-site]
     expected:
       if os == "android": NOTRUN
+      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): NOTRUN
 
   [Reloaded cross-site top-level form POSTs are not same-site]
     expected:
       if os == "android": NOTRUN
+      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): NOTRUN
 

testing/web-platform/meta/css/css-align/gaps/column-gap-parsing-001.html.ini

@@ -0,0 +1,4 @@
+[column-gap-parsing-001.html]
+  [column-gap accepts calc() mixing fixed and percentage values]
+    expected: FAIL
+

testing/web-platform/meta/css/css-align/gaps/gap-parsing-001.html.ini

@@ -0,0 +1,4 @@
+[gap-parsing-001.html]
+  [gap accepts calc() mixing fixed and percentage values]
+    expected: FAIL
+

testing/web-platform/meta/css/css-align/gaps/grid-column-gap-parsing-001.html.ini

@@ -0,0 +1,4 @@
+[grid-column-gap-parsing-001.html]
+  [grid-column-gap accepts calc() mixing fixed and percentage values]
+    expected: FAIL
+

testing/web-platform/meta/css/css-align/gaps/grid-gap-parsing-001.html.ini

@@ -0,0 +1,4 @@
+[grid-gap-parsing-001.html]
+  [grid-gap accepts calc() mixing fixed and percentage values]
+    expected: FAIL
+

testing/web-platform/meta/css/css-align/gaps/grid-row-gap-parsing-001.html.ini

@@ -0,0 +1,4 @@
+[grid-row-gap-parsing-001.html]
+  [grid-row-gap accepts calc() mixing fixed and percentage values]
+    expected: FAIL
+

testing/web-platform/meta/css/css-align/gaps/row-gap-parsing-001.html.ini

@@ -0,0 +1,4 @@
+[row-gap-parsing-001.html]
+  [row-gap accepts calc() mixing fixed and percentage values]
+    expected: FAIL
+

testing/web-platform/meta/css/css-transforms/translate-getComputedStyle.html.ini

@@ -1,4 +0,0 @@
-[translate-getComputedStyle.html]
-  [computed style for translate]
-    expected: FAIL
-

testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini

@@ -1,3 +1,2 @@
 [object-position-svg-002e.html]
-  expected:
-    FAIL
+  expected: FAIL

testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_term_nesting_level_nonzero.window.js.ini

@@ -1,5 +1,7 @@
 [no_window_open_when_term_nesting_level_nonzero.window.html]
-  expected: ERROR
+  expected:
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    ERROR
   [no popups from synchronously reachable window]
     expected: FAIL
 

testing/web-platform/meta/mozilla-sync

@@ -1,2 +1,2 @@
-local: 914b3450164f0ecd5e9cd15076c347464515fd9f
-upstream: be998ebbfc08085f18c1f9ed8d22c52b03134167
+local: 2ddea9a53594e1fc30a9f6366b99be95911716ff
+upstream: 0944ee217e239e6b7cb0d532c828e728ff9b60e1

testing/web-platform/meta/origin-policy/origin-policy-features.https.tentative.html.ini

@@ -0,0 +1,4 @@
+[origin-policy-features.https.tentative.html]
+  [Origin-Policy-based Feature policy]
+    expected: FAIL
+

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[insecure-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[upgrade-protocol.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[generic.http.html]
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[cross-origin.http.html]
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[cross-origin.http.html]
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[cross-origin.http.html]
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini

@@ -1,4 +1,4 @@
-[generic.keep-origin-redirect.http.html]
+[cross-origin.http.html]
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini

@@ -1,4 +1,4 @@
-[generic.no-redirect.http.html]
+[cross-origin.http.html]
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini

@@ -1,4 +1,4 @@
-[generic.swap-origin-redirect.http.html]
+[cross-origin.http.html]
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini

@@ -1,4 +1,4 @@
-[same-insecure.keep-origin-redirect.http.html]
+[same-origin-insecure.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini

@@ -1,4 +1,4 @@
-[same-insecure.no-redirect.http.html]
+[same-origin-insecure.http.html]
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 

testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini

@@ -1,4 +0,0 @@
-[same-origin-insecure.keep-origin-redirect.http.html]
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-