App history API to navigation API rename (3/n)

navigation-api/currententrychange-event/anchor-click.html

@@ -14,5 +14,5 @@
   });
   a.click();
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for link click");
+}, "currententrychange fires for link click");
 </script>

navigation-api/currententrychange-event/constructor.html

@@ -4,20 +4,20 @@
 <script>
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryCurrentChangeEvent("currententrychange");
+    new NavigationCurrentEntryChangeEvent("currententrychange");
   });
 }, "can't bypass required members by omitting the dictionary entirely");
 
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryCurrentChangeEvent("currententrychange", {
+    new NavigationCurrentEntryChangeEvent("currententrychange", {
       navigationType: "push"
     });
   });
 }, "from is required");
 
 test(() => {
-  const event = new AppHistoryCurrentChangeEvent("currententrychange", {
+  const event = new NavigationCurrentEntryChangeEvent("currententrychange", {
     navigationType: "replace",
     from: navigation.currentEntry
   });
@@ -26,7 +26,7 @@
 }, "all properties are reflected back");
 
 test(t => {
-  const event = new AppHistoryCurrentChangeEvent("currententrychange", { from: navigation.currentEntry });
+  const event = new NavigationCurrentEntryChangeEvent("currententrychange", { from: navigation.currentEntry });
   assert_equals(event.navigationType, null);
 }, "defaults are as expected");
 </script>

navigation-api/currententrychange-event/history-back-same-doc.html

@@ -20,5 +20,5 @@
   assert_false(oncurrententrychange_called);
   await new Promise(resolve => window.onpopstate = resolve);
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for history.back()");
+}, "currententrychange fires for history.back()");
 </script>

navigation-api/currententrychange-event/history-pushState.html

@@ -12,5 +12,5 @@
   });
   history.pushState(1, "", "#1");
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for history.pushState()");
+}, "currententrychange fires for history.pushState()");
 </script>

navigation-api/currententrychange-event/history-replaceState.html

@@ -14,5 +14,5 @@
   });
   history.replaceState(1, "", "#1");
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for history.replaceState()");
+}, "currententrychange fires for history.replaceState()");
 </script>

navigation-api/currententrychange-event/location-api.html

@@ -14,5 +14,5 @@
   });
   location.hash = "#foo";
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for location API navigations");
+}, "currententrychange fires for location API navigations");
 </script>

navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html

@@ -11,5 +11,5 @@
   assert_equals(w.location.href, "about:blank#2");
 
   await new Promise(resolve => t.step_timeout(resolve, 10));
-}, "AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank (popup window)");
+}, "currententrychange does not fire when navigating away from the initial about:blank (popup window)");
 </script>

navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html

@@ -8,5 +8,5 @@
   i.contentWindow.location.href = "about:blank#1";
   i.contentWindow.location.href = "about:blank#2";
   await new Promise(resolve => t.step_timeout(resolve, 10));
-}, "AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank");
+}, "currententrychange does not fire when navigating away from the initial about:blank");
 </script>

navigation-api/currententrychange-event/navigate-from-initial-about-blank.html

@@ -7,5 +7,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire");
   i.contentWindow.navigation.navigate("/common/blank.html");
   await new Promise(resolve => t.step_timeout(resolve, 10));
-}, "AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank");
+}, "currententrychange does not fire when navigating away from the initial about:blank");
 </script>

navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html

@@ -16,5 +16,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.forward();
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.back() and navigation.forward()");
+}, "currententrychange does not fire for cross-document navigation.back() and navigation.forward()");
 </script>

navigation-api/currententrychange-event/navigation-back-forward-same-doc.html

@@ -36,5 +36,5 @@
   assert_false(oncurrententrychange_forward_called);
   await forward_result.committed.then(() => forward_committed = true);
   assert_true(oncurrententrychange_forward_called);
-}, "AppHistoryCurrentChangeEvent fires for navigation.back() and navigation.forward()");
+}, "currententrychange fires for same-document navigation.back() and navigation.forward()");
 </script>

navigation-api/currententrychange-event/navigation-navigate-cross-doc.html

@@ -8,5 +8,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.navigate("/common/blank.html?1");
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.navigate()");
+}, "currententrychange does not fire for cross-document navigation.navigate()");
 </script>

navigation-api/currententrychange-event/navigation-navigate-preventDefault.html

@@ -6,5 +6,5 @@
   navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire");
   navigation.onnavigate = e => e.preventDefault();
   await promise_rejects_dom(t, "AbortError", navigation.navigate("#foo").committed);
-}, "AppHistoryCurrentChangeEvent does not fire when onnavigate preventDefault() is called");
+}, "currententrychange does not fire when onnavigate preventDefault() is called");
 </script>

navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html

@@ -8,5 +8,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.navigate("/common/blank.html?1", { replace: true });
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.navigate() with replace");
+}, "currententrychange does not fire for cross-document navigation.navigate() with replace");
 </script>

navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html

@@ -19,5 +19,5 @@
   let result = navigation.navigate("#foo", { replace: true });
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate() with replace");
+}, "currententrychange fires for navigation.navigate() with replace");
 </script>

navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html

@@ -19,5 +19,5 @@
   let result = i.contentWindow.navigation.navigate("/common/blank.html?1", { replace: true });
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate() with replace intercepted by transitionWhile");
+}, "currententrychange fires for navigation.navigate() with replace intercepted by transitionWhile()");
 </script>

navigation-api/currententrychange-event/navigation-navigate-same-doc.html

@@ -17,5 +17,5 @@
   let result = navigation.navigate("#foo");
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate()");
+}, "currententrychange fires for navigation.navigate()");
 </script>

navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html

@@ -17,5 +17,5 @@
   let result = i.contentWindow.navigation.navigate("/common/blank.html?1");
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate() intercepted by transitionWhile");
+}, "currententrychange fires for navigation.navigate() intercepted by transitionWhile()");
 </script>

navigation-api/currententrychange-event/navigation-reload-cross-doc.html

@@ -8,5 +8,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.reload();
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.reload()");
+}, "currententrychange does not fire for cross-document navigation.reload()");
 </script>

navigation-api/currententrychange-event/navigation-reload-transitionWhile.html

@@ -17,5 +17,5 @@
   let result = i.contentWindow.navigation.reload();
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.reload() intercepted by transitionWhile");
+}, "currententrychange fires for navigation.reload() intercepted by transitionWhile()");
 </script>

navigation-api/currententrychange-event/navigation-updateCurrentEntry.html

@@ -16,5 +16,5 @@
   // "Updating" the state to the current state should still fire currententrychange.
   navigation.updateCurrentEntry({ state: navigation.currentEntry.getState() });
   assert_equals(oncurrententrychange_count, 2);
-}, "AppHistoryCurrentChangeEvent fires for navigation.updateCurrentEntry()");
+}, "currententrychange fires for navigation.updateCurrentEntry()");
 </script>

navigation-api/currententrychange-event/properties.html

@@ -4,11 +4,11 @@
 <script>
 async_test(t => {
   navigation.oncurrententrychange = t.step_func_done(e => {
-    assert_equals(e.constructor, AppHistoryCurrentChangeEvent);
+    assert_equals(e.constructor, NavigationCurrentEntryChangeEvent);
     assert_false(e.bubbles);
     assert_false(e.cancelable);
     assert_true(e.isTrusted);
   });
   location.href = "#1";
-}, "AppHistoryCurrentChangeEvent's properties");
+}, "NavigationCurrentEntryChangeEvent's properties");
 </script>

navigation-api/navigate-event/event-constructor.html

@@ -4,13 +4,13 @@
 <script>
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryNavigateEvent("navigate");
+    new NavigateEvent("navigate");
   });
 }, "can't bypass required members by omitting the dictionary entirely");
 
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryNavigateEvent("navigate", {
+    new NavigateEvent("navigate", {
       navigationType: "push",
       canTransition: false,
       userInitiated: false,
@@ -23,10 +23,10 @@
 }, "destination is required");
 
 async_test(t => {
-  // We need to grab an AppHistoryDestination.
+  // We need to grab an NavigationDestination.
   navigation.onnavigate = t.step_func_done(e => {
     assert_throws_js(TypeError, () => {
-      new AppHistoryNavigateEvent("navigate", {
+      new NavigateEvent("navigate", {
         navigationType: "push",
         destination: e.destination,
         canTransition: false,
@@ -41,13 +41,13 @@
 }, "signal is required");
 
 async_test(t => {
-  // We need to grab an AppHistoryDestination.
+  // We need to grab an NavigationDestination.
   navigation.onnavigate = t.step_func_done(e => {
     const info = { some: "object with identity" };
     const formData = new FormData();
     const signal = (new AbortController()).signal;
 
-    const event = new AppHistoryNavigateEvent("navigate", {
+    const event = new NavigateEvent("navigate", {
       navigationType: "replace",
       destination: e.destination,
       canTransition: true,
@@ -71,9 +71,9 @@
 }, "all properties are reflected back");
 
 async_test(t => {
-  // We need to grab an AppHistoryDestination.
+  // We need to grab an NavigationDestination.
   navigation.onnavigate = t.step_func_done(e => {
-    const event = new AppHistoryNavigateEvent("navigate", {
+    const event = new NavigateEvent("navigate", {
       destination: e.destination,
       signal: (new AbortController()).signal
     });

navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html

@@ -17,5 +17,5 @@
   await promise_rejects_dom(t, 'AbortError', iframe_constructor, i.contentWindow.navigation.navigate("#1").committed);
   assert_true(abort_signal.aborted);
   assert_true(onabort_called);
-}, "window detach inside AppHistoryNavigateEvent signals AppHistoryNavigateEvent.signal");
+}, "window detach inside a navigate event signals event.signal");
 </script>

navigation-api/navigate-event/signal-abort-preventDefault.html

@@ -15,5 +15,5 @@
   await promise_rejects_dom(t, 'AbortError', navigation.navigate("?1").committed);
   assert_true(abort_signal.aborted);
   assert_array_equals(events, ["onabort", "onnavigateerror"]);
-}, "AppHistoryNavigateEvent.preventDefault signals AppHistoryNavigateEvent.signal");
+}, "event.preventDefault() signals event.signal");
 </script>

navigation-api/navigate-event/signal-abort-transitionWhile.html

@@ -14,5 +14,5 @@
   await navigation.navigate("?1").finished;
   assert_false(abort_signal.aborted);
   assert_false(onabort_called);
-}, "AppHistoryNavigateEvent's transitionWhile() does not signal AppHistoryNavigateEvent's signal");
+}, "event.transitionWhile() does not signal event.signal");
 </script>

navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html

@@ -36,5 +36,5 @@
       t.step_timeout(t.step_func_done(() => {}), 5);
     });
   });
-}, "window.stop() cancels AppHistoryNavigateEvent's transitionWhile() and signals AppHistoryNavigateEvent's signal");
+}, "window.stop() cancels the navigate event's transitionWhile() and signals event.signal");
 </script>

navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html

@@ -20,5 +20,5 @@
     assert_true(onabort_called);
     assert_true(canceled_in_second_handler);
   });
-}, "window.stop() signals AppHistoryNavigateEvent.signal inside a navigate event handler");
+}, "window.stop() signals event.signal inside a navigate event handler");
 </script>

navigation-api/navigate-event/signal-abort-window-stop.html

@@ -19,5 +19,5 @@
     // didn't fire on a microtask.
     t.step_timeout(t.step_func_done(() => {}), 0);
   });
-}, "window.stop() signals AppHistoryNavigateEvent.signal");
+}, "window.stop() signals event.signal");
 </script>

navigation-api/navigate-event/transitionWhile-after-dispatch.html

@@ -12,5 +12,5 @@
   });
 
   location.href = "#1";
-}, "AppHistoryNavigateEvent's transitionWhile() throws if used after the dispatch phase");
+}, "event.transitionWhile() throws if used after the dispatch phase");
 </script>

navigation-api/navigate-event/transitionWhile-canceled-event.html

@@ -13,5 +13,5 @@
 
   location.href = "#1";
   assert_true(assertionHappened);
-}, "AppHistoryNavigateEvent's transitionWhile() throws if used on a canceled event");
+}, "event.transitionWhile() throws if used on a canceled event");
 </script>

navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html

@@ -15,5 +15,5 @@
   });
 
   window.onload = t.step_func(() => location.href = target_url);
-}, "AppHistoryNavigateEvent's transitionWhile() intercepts a same-origin cross-document navigation");
+}, "event.transitionWhile() intercepts a same-origin cross-document navigation");
 </script>

navigation-api/navigate-event/transitionWhile-cross-origin.html

@@ -14,5 +14,5 @@
   });
 
   window.onload = t.step_func(() => location.href = get_host_info().HTTPS_REMOTE_ORIGIN);
-}, "AppHistoryNavigateEvent's transitionWhile() should throw if called for a cross origin navigation");
+}, "event.transitionWhile() should throw if called for a cross origin navigation");
 </script>

navigation-api/navigate-event/transitionWhile-detach.html

@@ -13,5 +13,5 @@
 
     i.contentWindow.location.href = "#1";
   });
-}, "AppHistoryNavigateEvent's transitionWhile() throws if used on an event from a detached iframe");
+}, "event.transitionWhile() throws if used on an event from a detached iframe");
 </script>

navigation-api/navigate-event/transitionWhile-history-pushState.html

@@ -19,5 +19,5 @@
   assert_equals(location.hash, "#1");
   assert_equals(history.state, "update");
   assert_equals(history.length, start_length + 1);
-}, "AppHistoryNavigateEvent's transitionWhile() should proceed if the given promise resolves");
+}, "event.transitionWhile() should proceed if the given promise resolves");
 </script>

navigation-api/navigate-event/transitionWhile-history-replaceState.html

@@ -19,5 +19,5 @@
   assert_equals(location.hash, "#1");
   assert_equals(history.state, "update");
   assert_equals(history.length, start_length);
-}, "AppHistoryNavigateEvent's transitionWhile() should proceed if the given promise resolves");
+}, "event.transitionWhile() should proceed if the given promise resolves");
 </script>

navigation-api/navigate-event/transitionWhile-multiple-times-reject.html

@@ -31,5 +31,5 @@
   }));
   assert_true(onnavigateerror_called);
   assert_true(caught_rejection);
-}, "AppHistoryNavigateEvent's transitionWhile() is called multiple times and one of the promises rejects");
+}, "event.transitionWhile() is called multiple times and one of the promises rejects");
 </script>

navigation-api/navigate-event/transitionWhile-multiple-times.html

@@ -37,5 +37,5 @@
   assert_true(p1_resolved);
   assert_true(p2_resolved);
   assert_true(p3_resolved);
-}, "navigation.navigate() returns a finished promise that awaits all promises if AppHistoryNavigateEvent's transitionWhile() is called multiple times");
+}, "navigation.navigate() returns a finished promise that awaits all promises if event.transitionWhile() is called multiple times");
 </script>

navigation-api/navigate-event/transitionWhile-navigation-back.html

@@ -15,5 +15,5 @@
       }));
     });
   }, 0);
-}, "AppHistoryNavigateEvent's transitionWhile() can intercept navigation.back()");
+}, "event.transitionWhile() can intercept navigation.back()");
 </script>

navigation-api/navigate-event/transitionWhile-on-synthetic-event.html

@@ -3,15 +3,15 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
-  // We need to grab an AppHistoryDestination to construct the event.
+  // We need to grab an NavigationDestination to construct the event.
   navigation.onnavigate = t.step_func_done(e => {
-    const event = new AppHistoryNavigateEvent("navigate", {
+    const event = new NavigateEvent("navigate", {
       destination: e.destination,
       signal: (new AbortController()).signal
     });
 
     assert_throws_dom("SecurityError", () => event.transitionWhile(Promise.resolve()));
   });
   history.pushState(1, null, "#1");
-}, "AppHistoryNavigateEvent's transitionWhile() throws if invoked on a synthetic event");
+}, "event.transitionWhile() throws if invoked on a synthetic event");
 </script>

navigation-api/navigate-event/transitionWhile-reject.html

@@ -22,5 +22,5 @@
 
   location.href = "#1";
   assert_equals(location.hash, "#1");
-}, "AppHistoryNavigateEvent's transitionWhile() should abort if the given promise rejects");
+}, "event.transitionWhile() should abort if the given promise rejects");
 </script>