From 0f40fe747e73a1953f0325750df1c17682ac25e5 Mon Sep 17 00:00:00 2001
From: Yifan Luo <lyf@google.com>
Date: Fri, 25 Oct 2019 07:12:34 -0700
Subject: [PATCH] Fetch Metadata: deprecate `nested-navigate` mode.

As discussed in
https://github.com/w3c/webappsec-fetch-metadata/issues/45,

We have decided to shift the model around nested navigations from
exposure via the request's `mode` to its `destination`. This patch
shift the `nested-navigate` mode to two parts:
 - `navigate` for frame and iframe.
 - `no-cors` for object.

Change-Id: I09a2be6b41547f6eeb1e308416234a40f0c9b5b3
---
 fetch/metadata/iframe.tentative.https.sub.html | 12 ++++++------
 fetch/metadata/iframe.tentative.sub.html       |  2 +-
 fetch/metadata/portal.tentative.https.sub.html |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fetch/metadata/iframe.tentative.https.sub.html b/fetch/metadata/iframe.tentative.https.sub.html
index b8f11c66b7edee..60ccbba721ba3d 100644
--- a/fetch/metadata/iframe.tentative.https.sub.html
+++ b/fetch/metadata/iframe.tentative.https.sub.html
@@ -44,36 +44,36 @@
   create_test("{{host}}:{{ports[https][0]}}", FORCED, {
     "site": "same-origin",
     "user": "",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, {
     "site": "same-site",
     "user": "",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, {
     "site": "cross-site",
     "user": "",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{host}}:{{ports[https][0]}}", USER, {
     "site": "same-origin",
     "user": "?1",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, {
     "site": "same-site",
     "user": "?1",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, {
     "site": "cross-site",
     "user": "?1",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 </script>
diff --git a/fetch/metadata/iframe.tentative.sub.html b/fetch/metadata/iframe.tentative.sub.html
index c5469f458d37be..be57362e9f0505 100644
--- a/fetch/metadata/iframe.tentative.sub.html
+++ b/fetch/metadata/iframe.tentative.sub.html
@@ -68,7 +68,7 @@
       assert_header_equals(e.data, {
         "site": "cross-site",
         "user": "",
-        "mode": "nested-navigate",
+        "mode": "navigate",
       });
       t.done();
     }));
diff --git a/fetch/metadata/portal.tentative.https.sub.html b/fetch/metadata/portal.tentative.https.sub.html
index ee24b5ecbb90c7..f9e370c67fbcbe 100644
--- a/fetch/metadata/portal.tentative.https.sub.html
+++ b/fetch/metadata/portal.tentative.https.sub.html
@@ -27,18 +27,18 @@
   create_test("{{host}}:{{ports[https][0]}}", {
     "site": "same-origin",
     "user": "",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{hosts[][www]}}:{{ports[https][0]}}", {
     "site": "same-site",
     "user": "",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 
   create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", {
     "site": "cross-site",
     "user": "",
-    "mode": "nested-navigate"
+    "mode": "navigate"
   });
 </script>