From 1832abd9419a532881abe413ef20e717ee8d2a3e Mon Sep 17 00:00:00 2001
From: Ian Clelland <iclelland@chromium.org>
Date: Thu, 22 Nov 2018 07:59:36 -0800
Subject: [PATCH] Fix Feature Policy report output

This brings the feature policy report format in line with the spec,
and fixes the tests which were broken by WPT import.

Bug: 907232
Change-Id: If9d9469956221c18a1aa72ee39debb1340efc01f
Reviewed-on: https://chromium-review.googlesource.com/c/1338167
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610427}
---
 .../experimental-features/resources/common.js       |  4 ++--
 .../reporting/camera-report-only.https.html         |  6 +++---
 .../reporting/camera-reporting.https.html           |  1 -
 .../reporting/document-write-report-only.html       |  6 +++---
 .../reporting/document-write-reporting.html         |  1 -
 .../encrypted-media-report-only.https.html          |  6 +++---
 .../reporting/encrypted-media-reporting.https.html  |  7 +++----
 .../reporting/fullscreen-report-only.html           |  6 +++---
 feature-policy/reporting/fullscreen-reporting.html  |  1 -
 .../reporting/generic-sensor-report-only.https.html | 13 ++++++-------
 .../reporting/generic-sensor-reporting.https.html   | 13 ++++++-------
 .../reporting/geolocation-report-only.https.html    |  6 +++---
 .../reporting/geolocation-reporting.https.html      |  2 --
 .../reporting/microphone-report-only.https.html     |  6 +++---
 .../reporting/microphone-reporting.https.html       |  1 -
 feature-policy/reporting/midi-report-only.html      |  6 +++---
 feature-policy/reporting/midi-reporting.html        |  1 -
 .../reporting/payment-report-only.https.html        |  6 +++---
 .../reporting/payment-reporting.https.html          |  1 -
 .../reporting/picture-in-picture-report-only.html   |  6 +++---
 .../reporting/picture-in-picture-reporting.html     |  9 ++++-----
 feature-policy/reporting/sync-xhr-report-only.html  |  6 +++---
 feature-policy/reporting/sync-xhr-reporting.html    |  1 -
 .../reporting/unsized-media-reporting.html          |  2 +-
 feature-policy/reporting/usb-report-only.https.html |  6 +++---
 feature-policy/reporting/usb-reporting.https.html   |  1 -
 feature-policy/reporting/vr-report-only.https.html  |  9 ++++-----
 feature-policy/reporting/vr-reporting.https.html    |  1 -
 feature-policy/reporting/xr-report-only.https.html  |  9 ++++-----
 feature-policy/reporting/xr-reporting.https.html    |  1 -
 30 files changed, 63 insertions(+), 81 deletions(-)

diff --git a/feature-policy/experimental-features/resources/common.js b/feature-policy/experimental-features/resources/common.js
index 42790b8a2e79cc..cbd0518ff21521 100644
--- a/feature-policy/experimental-features/resources/common.js
+++ b/feature-policy/experimental-features/resources/common.js
@@ -70,7 +70,7 @@ window.reporting_observer_instance = new ReportingObserver((reports, observer) =
   if (window.reporting_observer_callback) {
     reports.forEach(window.reporting_observer_callback);
   }
-}, {types: ["feature-policy"]});
+}, {types: ["feature-policy-violation"]});
 window.reporting_observer_instance.observe();
 window.reporting_observer_callback = null;
 
@@ -79,7 +79,7 @@ function wait_for_violation_in_file(feature, file_name) {
   return new Promise( (resolve) => {
     assert_equals(null, window.reporting_observer_callback);
     window.reporting_observer_callback = (report) => {
-        var feature_match = (feature === report.body.feature);
+        var feature_match = (feature === report.body.featureId);
         var file_name_match =
             !file_name ||
             (report.body.sourceFile.indexOf(file_name) !== -1);
diff --git a/feature-policy/reporting/camera-report-only.https.html b/feature-policy/reporting/camera-report-only.https.html
index 26488687e6fc75..c22e1a51740d4b 100644
--- a/feature-policy/reporting/camera-report-only.https.html
+++ b/feature-policy/reporting/camera-report-only.https.html
@@ -10,15 +10,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "camera");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "camera");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for user media');
   await navigator.mediaDevices.getUserMedia({video: true});
diff --git a/feature-policy/reporting/camera-reporting.https.html b/feature-policy/reporting/camera-reporting.https.html
index ced585139b3ee3..12b48dccb73c2b 100644
--- a/feature-policy/reporting/camera-reporting.https.html
+++ b/feature-policy/reporting/camera-reporting.https.html
@@ -13,7 +13,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "camera");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/document-write-report-only.html b/feature-policy/reporting/document-write-report-only.html
index ab0bb827166327..69ce9f82298641 100644
--- a/feature-policy/reporting/document-write-report-only.html
+++ b/feature-policy/reporting/document-write-report-only.html
@@ -8,15 +8,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "document-write");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "document-write");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   document.write("This should be written into the document");
   check_report_format(await report);
diff --git a/feature-policy/reporting/document-write-reporting.html b/feature-policy/reporting/document-write-reporting.html
index 93672fac35b6cf..e67bff0773e039 100644
--- a/feature-policy/reporting/document-write-reporting.html
+++ b/feature-policy/reporting/document-write-reporting.html
@@ -13,7 +13,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "document-write");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/encrypted-media-report-only.https.html b/feature-policy/reporting/encrypted-media-report-only.https.html
index 20e44b2fd5db2a..9ab4b0fe8569db 100644
--- a/feature-policy/reporting/encrypted-media-report-only.https.html
+++ b/feature-policy/reporting/encrypted-media-report-only.https.html
@@ -8,15 +8,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "encrypted-media");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "encrypted-media");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await navigator.requestMediaKeySystemAccess("org.w3.clearkey",
       [{
diff --git a/feature-policy/reporting/encrypted-media-reporting.https.html b/feature-policy/reporting/encrypted-media-reporting.https.html
index c3b63936b3a831..6575a68ebd8eb0 100644
--- a/feature-policy/reporting/encrypted-media-reporting.https.html
+++ b/feature-policy/reporting/encrypted-media-reporting.https.html
@@ -8,12 +8,11 @@
     <script>
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
+  assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.feature, "encrypted-media");
+  assert_equals(report.body.featureId, "encrypted-media");
   assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
-  assert_equals(typeof report.body.message, "string");
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
 };
@@ -21,7 +20,7 @@
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await promise_rejects(t, "SecurityError",
     navigator.requestMediaKeySystemAccess("org.w3.clearkey",
diff --git a/feature-policy/reporting/fullscreen-report-only.html b/feature-policy/reporting/fullscreen-report-only.html
index a6b3d5adeed565..48fe9e3a69a81c 100644
--- a/feature-policy/reporting/fullscreen-report-only.html
+++ b/feature-policy/reporting/fullscreen-report-only.html
@@ -11,15 +11,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "fullscreen");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "fullscreen");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for fullscreen');
   await document.getElementById('fs').requestFullscreen();
diff --git a/feature-policy/reporting/fullscreen-reporting.html b/feature-policy/reporting/fullscreen-reporting.html
index 4190fdd19260cd..0153647d3a6542 100644
--- a/feature-policy/reporting/fullscreen-reporting.html
+++ b/feature-policy/reporting/fullscreen-reporting.html
@@ -12,7 +12,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "fullscreen");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/generic-sensor-report-only.https.html b/feature-policy/reporting/generic-sensor-report-only.https.html
index deb6adeb73679e..6c8c2efbf6c322 100644
--- a/feature-policy/reporting/generic-sensor-report-only.https.html
+++ b/feature-policy/reporting/generic-sensor-report-only.https.html
@@ -20,19 +20,18 @@
 
     // Validate that the reported feature is one of the sensor features, and that
     // we have not seen a report for this feature before.
-    assert_true(sensor_features_verified.hasOwnProperty(report.body.feature));
-    assert_false(sensor_features_verified[report.body.feature]);
+    assert_true(sensor_features_verified.hasOwnProperty(report.body.featureId));
+    assert_false(sensor_features_verified[report.body.featureId]);
 
     // Validate the remainder of the report
-    assert_equals(report.type, "feature-policy");
+    assert_equals(report.type, "feature-policy-violation");
     assert_equals(report.url, document.location.href);
-    assert_equals(report.body.disposition, "report");
     assert_equals(report.body.sourceFile, document.location.href);
-    assert_equals(typeof report.body.message, "string");
     assert_equals(typeof report.body.lineNumber, "number");
     assert_equals(typeof report.body.columnNumber, "number");
+    assert_equals(report.body.disposition, "report");
 
-    sensor_features_verified[report.body.feature] = true;
+    sensor_features_verified[report.body.featureId] = true;
   }
 
   // Test is only done when reports for all features have been seen
@@ -45,7 +44,7 @@
 
 async_test(t => {
   new ReportingObserver(t.step_func(check_report_format),
-                        {types: ['feature-policy']}).observe();
+                        {types: ['feature-policy-violation']}).observe();
   new Accelerometer();
   new AmbientLightSensor();
   new Gyroscope();
diff --git a/feature-policy/reporting/generic-sensor-reporting.https.html b/feature-policy/reporting/generic-sensor-reporting.https.html
index 517c7f6872146a..4ccfcbf0d214d3 100644
--- a/feature-policy/reporting/generic-sensor-reporting.https.html
+++ b/feature-policy/reporting/generic-sensor-reporting.https.html
@@ -20,19 +20,18 @@
 
     // Validate that the reported feature is one of the sensor features, and that
     // we have not seen a report for this feature before.
-    assert_true(sensor_features_verified.hasOwnProperty(report.body.feature));
-    assert_false(sensor_features_verified[report.body.feature]);
+    assert_true(sensor_features_verified.hasOwnProperty(report.body.featureId));
+    assert_false(sensor_features_verified[report.body.featureId]);
 
     // Validate the remainder of the report
-    assert_equals(report.type, "feature-policy");
+    assert_equals(report.type, "feature-policy-violation");
     assert_equals(report.url, document.location.href);
-    assert_equals(report.body.disposition, "enforce");
     assert_equals(report.body.sourceFile, document.location.href);
-    assert_equals(typeof report.body.message, "string");
     assert_equals(typeof report.body.lineNumber, "number");
     assert_equals(typeof report.body.columnNumber, "number");
+    assert_equals(report.body.disposition, "enforce");
 
-    sensor_features_verified[report.body.feature] = true;
+    sensor_features_verified[report.body.featureId] = true;
   }
 
   // Test is only done when reports for all features have been seen
@@ -45,7 +44,7 @@
 
 async_test(t => {
   new ReportingObserver(t.step_func(check_report_format),
-                        {types: ['feature-policy']}).observe();
+                        {types: ['feature-policy-violation']}).observe();
   assert_throws("SecurityError", () => new Accelerometer(), "Constructing sensors should be blocked by policy");
   assert_throws("SecurityError", () => new AmbientLightSensor(), "Constructing sensors should be blocked by policy");
   assert_throws("SecurityError", () => new Gyroscope(), "Constructing sensors should be blocked by policy");
diff --git a/feature-policy/reporting/geolocation-report-only.https.html b/feature-policy/reporting/geolocation-report-only.https.html
index cf2a75b766c3e6..6c62b622cda70c 100644
--- a/feature-policy/reporting/geolocation-report-only.https.html
+++ b/feature-policy/reporting/geolocation-report-only.https.html
@@ -8,15 +8,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "geolocation");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "geolocation");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   try {
     await new Promise((resolve, reject) => {
diff --git a/feature-policy/reporting/geolocation-reporting.https.html b/feature-policy/reporting/geolocation-reporting.https.html
index 05445fc1f1c04c..fe8761f803bdfd 100644
--- a/feature-policy/reporting/geolocation-reporting.https.html
+++ b/feature-policy/reporting/geolocation-reporting.https.html
@@ -13,9 +13,7 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "geolocation");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
-  assert_equals(typeof report.body.message, "string");
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
   assert_equals(report.body.disposition, "enforce");
diff --git a/feature-policy/reporting/microphone-report-only.https.html b/feature-policy/reporting/microphone-report-only.https.html
index 2d7b4d960d8b5f..539994cd70a2b5 100644
--- a/feature-policy/reporting/microphone-report-only.https.html
+++ b/feature-policy/reporting/microphone-report-only.https.html
@@ -10,15 +10,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "microphone");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "microphone");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for user media');
   await navigator.mediaDevices.getUserMedia({audio: true});
diff --git a/feature-policy/reporting/microphone-reporting.https.html b/feature-policy/reporting/microphone-reporting.https.html
index 246484fd6cfe87..2aeba8194e46a9 100644
--- a/feature-policy/reporting/microphone-reporting.https.html
+++ b/feature-policy/reporting/microphone-reporting.https.html
@@ -13,7 +13,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "microphone");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/midi-report-only.html b/feature-policy/reporting/midi-report-only.html
index e466ce0dc412e1..bf0234d3f6511f 100644
--- a/feature-policy/reporting/midi-report-only.html
+++ b/feature-policy/reporting/midi-report-only.html
@@ -8,15 +8,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "midi");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "midi");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   try {
     await navigator.requestMIDIAccess();
diff --git a/feature-policy/reporting/midi-reporting.html b/feature-policy/reporting/midi-reporting.html
index c5627e5a213627..94674a37a8106c 100644
--- a/feature-policy/reporting/midi-reporting.html
+++ b/feature-policy/reporting/midi-reporting.html
@@ -11,7 +11,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "midi");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/payment-report-only.https.html b/feature-policy/reporting/payment-report-only.https.html
index 6a7678b51e759e..d2b8e5ee9cc017 100644
--- a/feature-policy/reporting/payment-report-only.https.html
+++ b/feature-policy/reporting/payment-report-only.https.html
@@ -8,15 +8,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "payment");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "payment");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   try {
     const request = new PaymentRequest(
diff --git a/feature-policy/reporting/payment-reporting.https.html b/feature-policy/reporting/payment-reporting.https.html
index 828054a6caff34..6655210f6846b8 100644
--- a/feature-policy/reporting/payment-reporting.https.html
+++ b/feature-policy/reporting/payment-reporting.https.html
@@ -13,7 +13,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "payment");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/picture-in-picture-report-only.html b/feature-policy/reporting/picture-in-picture-report-only.html
index 157670f2cab802..9e113a92429bc4 100644
--- a/feature-policy/reporting/picture-in-picture-report-only.html
+++ b/feature-policy/reporting/picture-in-picture-report-only.html
@@ -12,8 +12,8 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "picture-in-picture");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "picture-in-picture");
   assert_equals(report.body.disposition, "report");
 };
 
@@ -28,7 +28,7 @@
 promise_pip_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   const videoElement = await loadVideo();
   await test_driver.bless('picture-in-picture');
diff --git a/feature-policy/reporting/picture-in-picture-reporting.html b/feature-policy/reporting/picture-in-picture-reporting.html
index f15f47c549d9f0..567d68c3ea8bc4 100644
--- a/feature-policy/reporting/picture-in-picture-reporting.html
+++ b/feature-policy/reporting/picture-in-picture-reporting.html
@@ -12,14 +12,13 @@
     <script>
 const check_report_format = (reports, observer) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy");
+  assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.feature, "picture-in-picture");
-  assert_equals(report.body.disposition, "enforce");
+  assert_equals(report.body.featureId, "picture-in-picture");
   assert_equals(report.body.sourceFile, document.location.href);
-  assert_equals(typeof report.body.message, "string");
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
+  assert_equals(report.body.disposition, "enforce");
 };
 
 const loadVideo = () => new Promise(resolve => {
@@ -33,7 +32,7 @@
 promise_pip_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   const videoElement = await loadVideo();
   await test_driver.bless('picture-in-picture');
diff --git a/feature-policy/reporting/sync-xhr-report-only.html b/feature-policy/reporting/sync-xhr-report-only.html
index f841f63d6ed350..76d26ed5027435 100644
--- a/feature-policy/reporting/sync-xhr-report-only.html
+++ b/feature-policy/reporting/sync-xhr-report-only.html
@@ -8,15 +8,15 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "sync-xhr");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "sync-xhr");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   const xhr = new XMLHttpRequest();
   xhr.open("GET", document.location.href, false);
diff --git a/feature-policy/reporting/sync-xhr-reporting.html b/feature-policy/reporting/sync-xhr-reporting.html
index 82200cdfbccc42..d92a68588eb847 100644
--- a/feature-policy/reporting/sync-xhr-reporting.html
+++ b/feature-policy/reporting/sync-xhr-reporting.html
@@ -13,7 +13,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "sync-xhr");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/unsized-media-reporting.html b/feature-policy/reporting/unsized-media-reporting.html
index 00a15587d44064..bb81a496ca5b81 100644
--- a/feature-policy/reporting/unsized-media-reporting.html
+++ b/feature-policy/reporting/unsized-media-reporting.html
@@ -12,7 +12,7 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "unsized-media");
-  assert_equals(typeof report.body.message, "string");
+  assert_equals(report.body.disposition, "enforce");
 };
 
 async_test(t => {
diff --git a/feature-policy/reporting/usb-report-only.https.html b/feature-policy/reporting/usb-report-only.https.html
index e44c6c528fd4fc..7933e9eb5f6c15 100644
--- a/feature-policy/reporting/usb-report-only.https.html
+++ b/feature-policy/reporting/usb-report-only.https.html
@@ -11,15 +11,15 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy");
-  assert_equals(report.body.feature, "usb");
+  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.body.featureId, "usb");
   assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for USB');
   await navigator.usb.getDevices();
diff --git a/feature-policy/reporting/usb-reporting.https.html b/feature-policy/reporting/usb-reporting.https.html
index 0ddff455537c7a..a63f3010e4e64c 100644
--- a/feature-policy/reporting/usb-reporting.https.html
+++ b/feature-policy/reporting/usb-reporting.https.html
@@ -13,7 +13,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "usb");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/vr-report-only.https.html b/feature-policy/reporting/vr-report-only.https.html
index 91016d388532c5..b64a2015f7cd46 100644
--- a/feature-policy/reporting/vr-report-only.https.html
+++ b/feature-policy/reporting/vr-report-only.https.html
@@ -8,20 +8,19 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy");
+  assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.feature, "vr");
-  assert_equals(report.body.disposition, "report");
+  assert_equals(report.body.featureId, "vr");
   assert_equals(report.body.sourceFile, document.location.href);
-  assert_equals(typeof report.body.message, "string");
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
+  assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   await navigator.getVRDisplays();
   check_report_format(await report);
diff --git a/feature-policy/reporting/vr-reporting.https.html b/feature-policy/reporting/vr-reporting.https.html
index e0bb63531171ff..42a2e7371ecf9c 100644
--- a/feature-policy/reporting/vr-reporting.https.html
+++ b/feature-policy/reporting/vr-reporting.https.html
@@ -11,7 +11,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "vr");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/feature-policy/reporting/xr-report-only.https.html b/feature-policy/reporting/xr-report-only.https.html
index 5d4fb062c1ea2b..b52bdbfaa47071 100644
--- a/feature-policy/reporting/xr-report-only.https.html
+++ b/feature-policy/reporting/xr-report-only.https.html
@@ -8,20 +8,19 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy");
+  assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.feature, "vr");
-  assert_equals(report.body.disposition, "report");
+  assert_equals(report.body.featureId, "vr");
   assert_equals(report.body.sourceFile, document.location.href);
-  assert_equals(typeof report.body.message, "string");
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
+  assert_equals(report.body.disposition, "report");
 };
 
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy']}).observe();
+                          {types: ['feature-policy-violation']}).observe();
   });
   try {
     await navigator.xr.requestDevice();
diff --git a/feature-policy/reporting/xr-reporting.https.html b/feature-policy/reporting/xr-reporting.https.html
index 0844860ad79efe..b737bb9a6047e7 100644
--- a/feature-policy/reporting/xr-reporting.https.html
+++ b/feature-policy/reporting/xr-reporting.https.html
@@ -11,7 +11,6 @@
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "vr");
-  assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");