Revert "[sub apps] enable wpt tests"

This reverts commit f56a10fc2ca726d6401a1c2232370faa8ce7d740.

Reason for revert: New tests fail on some Linux bots

Failure Link: https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20Tests/184324/overview

Original change's description:
> [sub apps] enable wpt tests
>
> Re-enable the tests in third_party/blink/web_tests/external/wpt/subapps.
>
> - Use virtual test suits to emulate isolated context with header overrides.
> - Modernized tests to fit new sub apps API shape.
> - Remove insecure context test because by definition isolated context cannot be insecure.
> - Add a test that checks permission policy behavior.
>
> Fixed: 40928236
> Change-Id: Idc3d52c01a5a4cb4f4f588ea8c6011e1e13b4901
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8122238
> Reviewed-by: Andrew Rayskiy <greengrape@google.com>
> Reviewed-by: Vladimir Levin <vmpstr@chromium.org>
> Reviewed-by: Rick Byers <rbyers@chromium.org>
> Commit-Queue: Vlad Krot <vkrot@google.com>
> Cr-Commit-Position: refs/heads/main@{#1668571}

Bug: 40928236
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Icd7537fdea44945284b4f83325c6805ff8886727
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8157180
Owners-Override: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Reviewed-by: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Commit-Queue: Anthony Vallee-Dubois <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1668824}

Author: Anthony Vallee-Dubois

interfaces/sub-apps.tentative.idl

@@ -25,31 +25,37 @@ self.SubAppsServiceTest = (() => {
     }
 
     add(install_urls) {
-      if (testInternal.serviceResultCode === -1) {
-        return Promise.resolve(testInternal.addCallReturnValue);
-      }
-      throw testInternal.serviceResultCode;
+      return Promise.resolve({
+        resultList: {
+          resultCode: testInternal.serviceResultCode,
+          results: testInternal.addCallReturnValue,
+        }
+      });
     }
 
     list() {
-      if (testInternal.serviceResultCode === -1) {
-        return Promise.resolve(testInternal.listCallReturnValue);
-      }
-      throw testInternal.serviceResultCode;
+      return Promise.resolve({
+        result: {
+          resultCode: testInternal.serviceResultCode,
+          subAppsList: testInternal.listCallReturnValue,
+        }
+      });
     }
 
     remove(manifest_ids) {
-      if (testInternal.serviceResultCode === -1) {
-        return Promise.resolve(testInternal.removeCallReturnValue);
-      }
-      throw testInternal.serviceResultCode;
+      return Promise.resolve({
+        resultList: {
+          resultCode: testInternal.serviceResultCode,
+          results: testInternal.removeCallReturnValue,
+        }
+      });
     }
   }
 
   let testInternal = {
     initialized: false,
     mockSubAppsService: null,
-    serviceResultCode: -1,
+    serviceResultCode: 0,
     addCallReturnValue: [],
     listCallReturnValue: [],
     removeCallReturnValue: [],
@@ -73,25 +79,13 @@ self.SubAppsServiceTest = (() => {
       };
     }
 
-    setAddCallReturnValue(value) {
-      testInternal.addCallReturnValue = value;
-    }
-
-    setListCallReturnValue(value) {
-      testInternal.listCallReturnValue = value;
-    }
-
-    setRemoveCallReturnValue(value) {
-      testInternal.removeCallReturnValue = value;
-    }
-
     async reset() {
       if (testInternal.initialized) {
         testInternal.mockSubAppsService.reset();
         testInternal = {
           mockSubAppsService: null,
           initialized: false,
-          serviceResultCode: -1,
+          serviceResultCode: 0,
           addCallReturnValue: [],
           listCallReturnValue: [],
           removeCallReturnValue: [],

resources/chromium/mock-subapps.js

@@ -16,9 +16,12 @@
 
   const iframeDOMException = iframe.contentWindow.DOMException;
 
-  const subApps = iframe.contentWindow.subApps;
+  // Detach the frame.
   iframe.remove();
-  await promise_rejects_dom(t, 'OperationError', iframeDOMException, subApps.add([]));
+
+  // At this point the iframe is detached and unloaded, and its execution
+  // context is gone.
+  await promise_rejects_dom(t, 'NotFoundError', iframeDOMException, iframe.contentWindow.subApps.add([]));
 }, "The object is no longer associated to a document.");
 
 promise_test(async t => {
@@ -28,22 +31,16 @@
   const iframeDOMException = iframe.contentWindow.DOMException;
   t.add_cleanup(() => iframe.remove());
 
-  await promise_rejects_dom(t, 'NotSupportedError', iframeDOMException, iframe.contentWindow.subApps.add([]));
+  await promise_rejects_dom(t, 'InvalidStateError', iframeDOMException, iframe.contentWindow.subApps.add([]));
 }, "API is only supported in top-level browsing contexts.");
 
 promise_test(async t => {
   const cross_origin_url = 'https://example.com/sub-app';
 
   let add_call_params = [cross_origin_url];
 
-  t.add_cleanup(async () => {
-    await mockSubAppsService.reset();
-    mockSubAppsService = null;
-  });
-
-  await createMockSubAppsService(Status.SUCCESS, [], [], []);
   await test_driver.bless("installing subapps", async function () {
-    await promise_rejects_js(t, TypeError, window.subApps.add(add_call_params));
+    await promise_rejects_dom(t, 'NotSupportedError', window.subApps.add(add_call_params));
   });
 }, 'API supports only same-origin URLs.');
 
@@ -53,17 +50,17 @@
 
   let add_call_params = [url_1, url_2];
 
-  let mocked_response = () => [
-    { "installPath": url_1, "manifestId": url_1, "resultType": SubAppsServiceAddResultType.kGenericError },
-    { "installPath": url_2, "manifestId": url_2, "resultType": SubAppsServiceAddResultType.kGenericError }
+  let mocked_response = [
+    { "installUrlPath": url_1, "manifestIdPath": url_1, "resultType": SubAppsServiceAddResultType.kOperationError },
+    { "installUrlPath": url_2, "manifestIdPath": url_2, "resultType": SubAppsServiceAddResultType.kOperationError }
   ];
 
-  let expected_results = () => ({
+  let expected_results = {
     failedApps: {
       [url_1]: "OperationError",
       [url_2]: "OperationError"
     }
-  });
+  };
 
   await test_driver.bless("installing a subapp", async function () {
     await subapps_add_expect_success_with_result(t, add_call_params, mocked_response, expected_results);
@@ -76,19 +73,19 @@
 
   let add_call_params = [url_1, url_2];
 
-  let mocked_response = () => [
-    { "installPath": url_1, "manifestId": url_1, "resultType": SubAppsServiceAddResultType.kSuccess },
-    { "installPath": url_2, "manifestId": url_2, "resultType": SubAppsServiceAddResultType.kGenericError }
+  let mocked_response = [
+    { "installUrlPath": url_1, "manifestIdPath": url_1, "resultType": SubAppsServiceAddResultType.kSuccess },
+    { "installUrlPath": url_2, "manifestIdPath": url_2, "resultType": SubAppsServiceAddResultType.kOperationError }
   ];
 
-  let expected_results = () => ({
+  let expected_results = {
     installedApps: {
       [url_1]: url_1
     },
     failedApps: {
       [url_2]: "OperationError"
     }
-  });
+  };
 
   await test_driver.bless("installing a subapp", async function () {
     await subapps_add_expect_success_with_result(t, add_call_params, mocked_response, expected_results);
@@ -105,7 +102,8 @@
     mockSubAppsService = null;
   });
 
-  await createMockSubAppsService(Status.USER_DECLINED, [], [], []);
+  // 2 corresponds to SubAppsServiceResultCode.kUserDenied
+  await createMockSubAppsService(2, [], [], []);
   await test_driver.bless("installing a subapp", async function () {
     await window.subApps.add(add_call_params).then(
       result => {

subapps/__dir__.headers

@@ -13,15 +13,15 @@
 
   let add_call_params = [install_url];
 
-  let mocked_response = () => [
-    { "installPath": install_url, "manifestId": install_url, "resultType": SubAppsServiceAddResultType.kSuccess }
+  let mocked_response = [
+    { "installUrlPath": install_url, "manifestIdPath": install_url, "resultType": SubAppsServiceAddResultType.kSuccess }
   ];
 
-  let expected_results = () => ({
+  let expected_results = {
     installedApps: {
       [install_url]: install_url
     }
-  });
+  };
 
   await test_driver.bless("installing a subapp", async function () {
     await subapps_add_expect_success_with_result(t, add_call_params, mocked_response, expected_results);
@@ -34,17 +34,17 @@
 
   let add_call_params = [url_1, url_2];
 
-  let mocked_response = () => [
-    { "installPath": url_1, "manifestId": url_1, "resultType": SubAppsServiceAddResultType.kSuccess },
-    { "installPath": url_2, "manifestId": url_2, "resultType": SubAppsServiceAddResultType.kSuccess }
+  let mocked_response = [
+    { "installUrlPath": url_1, "manifestIdPath": url_1, "resultType": SubAppsServiceAddResultType.kSuccess },
+    { "installUrlPath": url_2, "manifestIdPath": url_2, "resultType": SubAppsServiceAddResultType.kSuccess }
   ];
 
-  let expected_results = () => ({
+  let expected_results = {
     installedApps: {
       [url_1]: url_1,
       [url_2]: url_2
     }
-  });
+  };
 
   await test_driver.bless("installing a subapp", async function () {
     await subapps_add_expect_success_with_result(t, add_call_params, mocked_response, expected_results);

subapps/add-error.tentative.https.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>Sub Apps: subApps is undefined in insecure context (non-https)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+test(() => {
+  assert_equals(window.subApps, undefined);
+  assert_equals(window.SubApps, undefined);
+}, 'subApps is not defined in insecure context.');
+
+</script>

subapps/add-success.tentative.https.html

@@ -2,8 +2,6 @@
 <title>Sub Apps: Error cases for list()</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/subapps-helpers.js"></script>
 
 <body></body>
@@ -14,13 +12,14 @@
   const iframe = document.createElement('iframe');
   document.body.appendChild(iframe);
 
-  const subApps = iframe.contentWindow.subApps;
-  const DOMException_constructor = iframe.contentWindow.DOMException;
+  const iframeDOMException = iframe.contentWindow.DOMException;
+
+  // Detach the frame.
   iframe.remove();
 
   // At this point the iframe is detached and unloaded, and its execution
   // context is gone.
-  await promise_rejects_dom(t, 'OperationError', DOMException_constructor, subApps.list());
+  await promise_rejects_dom(t, 'NotFoundError', iframeDOMException, iframe.contentWindow.subApps.list());
 }, "The object is no longer associated to a document.");
 
 promise_test(async t => {
@@ -30,7 +29,16 @@
   const iframeDOMException = iframe.contentWindow.DOMException;
   t.add_cleanup(() => iframe.remove());
 
-  await promise_rejects_dom(t, 'NotSupportedError', iframeDOMException, iframe.contentWindow.subApps.list());
+  await promise_rejects_dom(t, 'InvalidStateError', iframeDOMException, iframe.contentWindow.subApps.list());
 }, "API is only supported in top-level browsing contexts.");
 
+promise_test(async t => {
+  t.add_cleanup(async () => {
+      await mockSubAppsService.reset();
+      mockSubAppsService = null;
+  });
+  await createMockSubAppsService(Status.FAILURE, [], []);
+  return promise_rejects_dom(t, 'OperationError', window.subApps.list());
+}, 'List call failed.');
+
 </script>

subapps/disabled-by-permissions-policy.tentative.https.html

@@ -2,8 +2,6 @@
 <title>Sub Apps: Valid calls for list()</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/subapps-helpers.js"></script>
 <script>
 
@@ -17,8 +15,8 @@
   const url_2 = '/sub-app-2';
 
   const mocked_response = [
-    { "manifestId": url_1, "appName": "App 1" },
-    { "manifestId": url_2, "appName": "App 2" },
+    { "manifestIdPath": url_1, "appName": "App 1" },
+    { "manifestIdPath": url_2, "appName": "App 2" },
   ];
 
   let expected_results = {
@@ -57,4 +55,4 @@
   })
 }, 'List API call works with no sub apps.');
 
-</script>
+</script>