From 92988f09cc90261565e946cf5e806d119e085620 Mon Sep 17 00:00:00 2001
From: Micajuine Ho <micajuineho@google.com>
Date: Fri, 26 Feb 2021 08:40:41 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=AE=20[amp-consent]=20Removing=20refer?=
 =?UTF-8?q?ences=20to=20deprecated=20`consents`=20(#32923)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/amp-consent/amp-consent-amp-ad.amp.html | 13 ++++++-------
 examples/amp-consent/amp-consent-iframe.amp.html |  1 -
 examples/amp-consent/cmp-vendors.amp.html        |  2 --
 extensions/amp-consent/amp-consent.md            |  8 ++------
 extensions/amp-consent/cmps/_ping_.md            |  1 -
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/examples/amp-consent/amp-consent-amp-ad.amp.html b/examples/amp-consent/amp-consent-amp-ad.amp.html
index 9406b273c1e1..af0d2c7b64a6 100644
--- a/examples/amp-consent/amp-consent-amp-ad.amp.html
+++ b/examples/amp-consent/amp-consent-amp-ad.amp.html
@@ -27,13 +27,12 @@
   <amp-consent id='ABC' layout='nodisplay' type='_ping_'>
     <script type="application/json">
       {
-            "consents": {},
-            "postPromptUI": "postPromptUI",
-            "clientConfig": {
-              "CMP_id": "test_id",
-              "other_info": "test_info"
-            }
-          }
+        "postPromptUI": "postPromptUI",
+        "clientConfig": {
+          "CMP_id": "test_id",
+          "other_info": "test_info"
+        }
+      }
     </script>
     <div id="postPromptUI">
       Post Prompt UI
diff --git a/examples/amp-consent/amp-consent-iframe.amp.html b/examples/amp-consent/amp-consent-iframe.amp.html
index a6e740400aa7..7fa50e32848b 100644
--- a/examples/amp-consent/amp-consent-iframe.amp.html
+++ b/examples/amp-consent/amp-consent-iframe.amp.html
@@ -79,7 +79,6 @@ <h2>Iframe never blocked</h2>
       <amp-consent id='ABC' layout='nodisplay' type='_ping_'>
         <script type="application/json">
           {
-            "consents": {},
             "postPromptUI": "postPromptUI",
             "clientConfig": {
               "CMP_id": "test_id",
diff --git a/examples/amp-consent/cmp-vendors.amp.html b/examples/amp-consent/cmp-vendors.amp.html
index 64f5ca073906..81b8f0ce594c 100644
--- a/examples/amp-consent/cmp-vendors.amp.html
+++ b/examples/amp-consent/cmp-vendors.amp.html
@@ -132,7 +132,6 @@ <h3>Image that is NOT blocked by consent</h3>
       <amp-consent id='ABC' layout='nodisplay' type='_ping_'>
         <script type="application/json">
           {
-            "consents": {},
             "postPromptUI": "postPromptUI",
             "clientConfig": {
               "CMP_id": "test_id",
@@ -184,7 +183,6 @@ <h3>Image that is NOT blocked by consent</h3>
       <amp-consent id='didomi' layout='nodisplay' type='didomi'>
           <script type="application/json">
             {
-              "consents": {},
               "postPromptUI": "postPromptUI",
               "clientConfig": {
                 "config": {
diff --git a/extensions/amp-consent/amp-consent.md b/extensions/amp-consent/amp-consent.md
index 22c97ed6e78b..a0b992667774 100644
--- a/extensions/amp-consent/amp-consent.md
+++ b/extensions/amp-consent/amp-consent.md
@@ -366,12 +366,8 @@ When defined, the post-prompt UI is shown when all prompt UIs have been hidden,
 <amp-consent layout="nodisplay" id="consent-element">
   <script type="application/json">
     {
-      "consents": {
-        "consent-foo": {
-          ...
-          "promptUI": "consent-ui"
-        }
-      },
+      "consentInstanceId": "consent-foo",
+      "promptUI": "consent-ui",
       "postPromptUI": "post-consent-ui"
     }
   </script>
diff --git a/extensions/amp-consent/cmps/_ping_.md b/extensions/amp-consent/cmps/_ping_.md
index 5626094f4c0a..bef20a7e2f16 100644
--- a/extensions/amp-consent/cmps/_ping_.md
+++ b/extensions/amp-consent/cmps/_ping_.md
@@ -24,7 +24,6 @@ A fake cmp type that is only used for local development.
 <amp-consent id="ABC" layout="nodisplay" type="_ping_">
   <script type="application/json">
     {
-      "consents": {},
       "postPromptUI": "postPromptUI",
       "clientConfig": {
         "CMP_id": "test_id",