From 3c55c27fd994ba2b448ff308b7e876f408097622 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:50:26 +0000
Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=93=A6=20Update=20dependency=20chrome?=
 =?UTF-8?q?driver=20to=20v131?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build-system/tasks/e2e/package-lock.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build-system/tasks/e2e/package-lock.json b/build-system/tasks/e2e/package-lock.json
index 11d5a4df4dda..d09354aad6a0 100644
--- a/build-system/tasks/e2e/package-lock.json
+++ b/build-system/tasks/e2e/package-lock.json
@@ -719,9 +719,15 @@
       }
     },
     "node_modules/chromedriver": {
+<<<<<<< HEAD
       "version": "131.0.4",
       "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.4.tgz",
       "integrity": "sha512-JgIkept8YrnqT05ldLaOzxxEJDUV1t3PFIIMO/gQz9AbnpZx7Pl1zq6tQTTz2HoY5T2JKZ5kyiEWwc48g4fJ5w==",
+=======
+      "version": "131.0.2",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.2.tgz",
+      "integrity": "sha512-Z3oZmleJP3UEBKCz7XLZoZSbYRnApFmUL4GGmLHxw/NJqcZpEnCNFlwdVKuRlntCPxgdfvYInQCPmZxXyrGE+w==",
+>>>>>>> becd73a4d4 (📦 Update dependency chromedriver to v131)
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -2594,9 +2600,15 @@
       }
     },
     "chromedriver": {
+<<<<<<< HEAD
       "version": "131.0.4",
       "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.4.tgz",
       "integrity": "sha512-JgIkept8YrnqT05ldLaOzxxEJDUV1t3PFIIMO/gQz9AbnpZx7Pl1zq6tQTTz2HoY5T2JKZ5kyiEWwc48g4fJ5w==",
+=======
+      "version": "131.0.2",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.2.tgz",
+      "integrity": "sha512-Z3oZmleJP3UEBKCz7XLZoZSbYRnApFmUL4GGmLHxw/NJqcZpEnCNFlwdVKuRlntCPxgdfvYInQCPmZxXyrGE+w==",
+>>>>>>> becd73a4d4 (📦 Update dependency chromedriver to v131)
       "dev": true,
       "requires": {
         "@testim/chrome-version": "^1.1.4",

From c97aac7b6f35dd958b7a930b2e5db4aa7e830c9c Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Fri, 27 Dec 2024 11:04:17 -0800
Subject: [PATCH 2/8] switch to realWin to resolve scheme-less url to the
 correct hostname

something changed recently with Url Parsing in Chrome or something in
the FakeWin implementation is causign it to not resolve properly.
Quick fix seems to be to switch it to a real window
---
 .../amp-skimlinks/0.1/test/test-affiliate-link-resolver.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
index 12d81ef80e54..1062e4823625 100644
--- a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
+++ b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
@@ -12,7 +12,7 @@ import {Waypoint} from '../waypoint';
 
 const DOMAIN_RESOLVER_API_URL = DEFAULT_CONFIG.beaconUrl;
 
-describes.fakeWin(
+describes.realWin(
   'AffiliateLinkResolver',
   {
     amp: {

From 10959412531b62d3f2ab7b625fdee39a318d1289 Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Fri, 27 Dec 2024 14:27:18 -0800
Subject: [PATCH 3/8] try out the disable feature

---
 build-system/tasks/e2e/describes-e2e.js             | 1 +
 build-system/tasks/runtime-test/custom-launchers.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/build-system/tasks/e2e/describes-e2e.js b/build-system/tasks/e2e/describes-e2e.js
index ce72cfb194d3..7dabae522af2 100644
--- a/build-system/tasks/e2e/describes-e2e.js
+++ b/build-system/tasks/e2e/describes-e2e.js
@@ -160,6 +160,7 @@ function getChromeArgs(config) {
   const args = [
     '--no-sandbox',
     '--disable-gpu',
+    '--disable-features=StandardCompliantNonSpecialSchemeURLParsing',
     `--window-size=${DEFAULT_E2E_INITIAL_RECT.width},${DEFAULT_E2E_INITIAL_RECT.height}`,
   ];
 
diff --git a/build-system/tasks/runtime-test/custom-launchers.js b/build-system/tasks/runtime-test/custom-launchers.js
index bd96683d0aa1..179fab603435 100644
--- a/build-system/tasks/runtime-test/custom-launchers.js
+++ b/build-system/tasks/runtime-test/custom-launchers.js
@@ -7,9 +7,11 @@
 const argv = require('minimist')(process.argv.slice(2));
 const {isCiBuild} = require('../../common/ci');
 
+console.log('erwinm running this');
 const DEFAULT_CHROME_FLAGS = [
   // Dramatically speeds up iframe creation.
   '--disable-extensions',
+  '--disable-features=StandardCompliantNonSpecialSchemeURLParsing',
   // Allows simulating user actions (e.g unmute) which will otherwise be denied.
   '--autoplay-policy=no-user-gesture-required',
   // Makes debugging easy by auto-opening devtools.

From 9cfe8ec885ba0cf8476f573d4eb87f59d55e1c37 Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Mon, 6 Jan 2025 11:42:50 -0800
Subject: [PATCH 4/8] rename to requestClose

---
 extensions/amp-lightbox/0.1/test/test-amp-lightbox.js | 3 ++-
 src/utils/close-watcher-impl.js                       | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
index f797c77ba44d..41b1f1721d83 100644
--- a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
@@ -114,7 +114,8 @@ describes.realWin(
       const setupCloseSpy = env.sandbox.spy(impl, 'close');
 
       await impl.open_({caller: sourceElement});
-      impl.closeWatcher_.signalClosed();
+
+      impl.closeWatcher_.requestClose();
       expect(setupCloseSpy).to.be.called;
     });
 
diff --git a/src/utils/close-watcher-impl.js b/src/utils/close-watcher-impl.js
index fa525552049c..75c28298df0d 100644
--- a/src/utils/close-watcher-impl.js
+++ b/src/utils/close-watcher-impl.js
@@ -67,11 +67,12 @@ export class CloseWatcherImpl {
 
   /**
    * Signals to the close watcher to close the modal.
-   * See `CloseWatcher.signalClosed`.
+   * See `CloseWatcher.requestClose`.
    */
-  signalClosed() {
+  requestClose() {
     if (this.watcher_) {
-      this.watcher_.signalClosed();
+
+      this.watcher_.requestClose();
     } else if (this.handler_) {
       const handler = this.handler_;
       handler();

From dbc858b6190e026e8a0ca5394b12f95dbaaf734a Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Mon, 6 Jan 2025 12:02:08 -0800
Subject: [PATCH 5/8] undo skip to test which tests are still failing

---
 .../amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js     |  6 ++----
 .../amp-analytics/0.1/test/test-iframe-transport.js  |  3 +--
 .../0.1/test-e2e/test-arrows-non-looping.js          |  9 +++------
 .../amp-lightbox/test-e2e/test-amp-lightbox.js       |  3 +--
 .../0.1/test-e2e/test-scrollbound-animation.js       |  3 +--
 .../0.1/test/test-affiliate-link-resolver.js         |  6 ++----
 .../test-e2e/test-amp-story-player-navigation.js     |  6 ++----
 .../test/test-e2e/test-amp-story-player-prerender.js | 12 ++++--------
 .../0.1/test/test-e2e/test-amp-story-player.js       |  3 +--
 .../amp-video/0.1/test/test-flexible-bitrate.js      |  3 +--
 test/unit/builtins/test-amp-pixel.js                 |  3 +--
 test/unit/utils/test-close-watcher-impl.js           |  9 +++------
 12 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
index 9e07e9043929..4fe5f25e2d8a 100644
--- a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
@@ -62,8 +62,7 @@ describes.endtoend(
       );
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('product2 ad opened', async () => {
+    it('product2 ad opened', async () => {
       const adDiv = await controller.findElement('#product2');
       await setTime(Number.MAX_VALUE);
       await controller.click(adDiv);
@@ -95,8 +94,7 @@ describes.endtoend(
       );
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('should open product2 after setting varible target', async () => {
+    it('should open product2 after setting varible target', async () => {
       const headline = await controller.findElement('h1');
       const nextButton = await controller.findElement('#next-btn');
       await setTime(Number.MAX_VALUE);
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport.js b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
index 5a643777b82d..2c30d02ec159 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
@@ -178,8 +178,7 @@ describes.realWin(
   'amp-analytics.iframe-transport',
   {amp: true, allowExternalResources: true},
   (env) => {
-    // TODO(#40214): fix flaky test.
-    it.skip('logs poor performance of vendor iframe', () => {
+    it('logs poor performance of vendor iframe', () => {
       const body =
         '<html><head><script>' +
         'function busyWait(count, duration, cb) {\n' +
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
index 12ec711ea954..1e30efe0d6bc 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
@@ -31,21 +31,18 @@ describes.endtoend(
       nextArrow = await getNextArrow(controller);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('should have the arrows in the correct initial state', async () => {
+    it('should have the arrows in the correct initial state', async () => {
       await expect(css(prevArrow, 'opacity')).to.equal('0');
       await expect(css(nextArrow, 'opacity')).to.equal('1');
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('should show the prev arrow when going to the first slide', async () => {
+    it('should show the prev arrow when going to the first slide', async () => {
       await controller.click(nextArrow);
       await expect(css(prevArrow, 'opacity')).to.equal('1');
       await expect(css(nextArrow, 'opacity')).to.equal('1');
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('should hide the next arrow when going to the end', async () => {
+    it('should hide the next arrow when going to the end', async () => {
       const el = await getScrollingElement(controller);
       await controller.scrollTo(el, {left: (SLIDE_COUNT - 1) * pageWidth});
 
diff --git a/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js b/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
index 9a9049d46723..ad5fed3df5ac 100644
--- a/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
@@ -58,8 +58,7 @@ describes.endtoend(
       ).to.equal(641);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('should close the lightbox', async () => {
+    it('should close the lightbox', async () => {
       const open = await controller.findElement('#open');
       await controller.click(open);
 
diff --git a/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js b/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
index 92630d967c10..638f02535e9d 100644
--- a/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
+++ b/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
@@ -15,8 +15,7 @@ async function testScroll(env) {
     controller = env.controller;
   });
 
-  // TODO(#40214): fix flaky test.
-  it.skip('should animate clock hand while scrolling', async () => {
+  it('should animate clock hand while scrolling', async () => {
     const step = 50;
     const initPoint = {
       'width': 53,
diff --git a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
index 1062e4823625..992c466c7cad 100644
--- a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
+++ b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
@@ -107,8 +107,7 @@ describes.realWin(
           resolver.resolveUnknownAnchors(anchorList);
         });
 
-        // TODO(#40214): fix flaky test.
-        it.skip('Should only ask for new domains the next times', () => {
+        it('Should only ask for new domains the next times', () => {
           // Set the domains like if we had already done a call to the API.
           resolver.domains_ = alreadyResolvedDomains;
 
@@ -396,8 +395,7 @@ describes.realWin(
           expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
         });
 
-        // TODO(#40214): fix flaky test.
-        it.skip('removes // protocol', () => {
+        it('removes // protocol', () => {
           const anchor = helpers.createAnchor('//test.com/');
           expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
         });
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
index 22dbe661715d..e35120883354 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
@@ -27,8 +27,7 @@ describes.endtoend(
       await expect(player);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('first story should be playing video', async () => {
+    it('first story should be playing video', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -50,8 +49,7 @@ describes.endtoend(
       await expect(isVideoPaused).to.eql(false);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('navigating to next story pauses the previous one', async () => {
+    it('navigating to next story pauses the previous one', async () => {
       // Navigate to next story.
       await controller.click(player);
 
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
index 8c143f3f0a97..72b0784b0086 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
@@ -22,8 +22,7 @@ describes.endtoend(
       await expect(player);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('when player is not visible in first viewport, it builds the shadow DOM container', async () => {
+    it('when player is not visible in first viewport, it builds the shadow DOM container', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -31,8 +30,7 @@ describes.endtoend(
       await expect(shadowHost);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('when player is not visible in first viewport, no stories are loaded or prerendered', async () => {
+    it('when player is not visible in first viewport, no stories are loaded or prerendered', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -51,8 +49,7 @@ describes.endtoend(
       await expect(count).to.eql(2);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('when player becomes visible in viewport, first story starts playing', async () => {
+    it('when player becomes visible in viewport, first story starts playing', async () => {
       const doc = await controller.getDocumentElement();
       const playerRect = await controller.getElementRect(player);
 
@@ -75,8 +72,7 @@ describes.endtoend(
       await expect(storyEl).to.exist;
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
+    it('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
       this.timeout(10000);
       const doc = await controller.getDocumentElement();
       const playerRect = await controller.getElementRect(player);
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js
index 874e0aaf5560..e3ca2f483253 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js
@@ -22,8 +22,7 @@ describes.endtoend(
       await expect(player);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('loads and displays first story on page load when player is visible in viewport', async () => {
+    it('loads and displays first story on page load when player is visible in viewport', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
diff --git a/extensions/amp-video/0.1/test/test-flexible-bitrate.js b/extensions/amp-video/0.1/test/test-flexible-bitrate.js
index 40cfcf32c007..6137f90ebb73 100644
--- a/extensions/amp-video/0.1/test/test-flexible-bitrate.js
+++ b/extensions/amp-video/0.1/test/test-flexible-bitrate.js
@@ -47,8 +47,7 @@ describes.fakeWin('amp-video flexible-bitrate', {}, (env) => {
       expect(currentBitrates(v0)[0]).to.equal(1000);
     });
 
-    // TODO(#40214): fix flaky test.
-    it.skip('should observe lower bandwidth on next sort', () => {
+    it('should observe lower bandwidth on next sort', () => {
       const m = getManager('4g');
       const v0 = getVideo([4000, 1000, 3000, 2000]);
       v0.id = 'v0';
diff --git a/test/unit/builtins/test-amp-pixel.js b/test/unit/builtins/test-amp-pixel.js
index 4e718a2f1a3c..de055bf26407 100644
--- a/test/unit/builtins/test-amp-pixel.js
+++ b/test/unit/builtins/test-amp-pixel.js
@@ -141,8 +141,7 @@ describes.realWin('amp-pixel', {amp: true}, (env) => {
     });
   });
 
-  // TODO(#40214): fix flaky test.
-  it.skip('should not allow attribution reporting', () => {
+  it('should not allow attribution reporting', () => {
     const attributionSrc =
       '//pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2';
     pixel.setAttribute(
diff --git a/test/unit/utils/test-close-watcher-impl.js b/test/unit/utils/test-close-watcher-impl.js
index 970370eee754..35abefda126d 100644
--- a/test/unit/utils/test-close-watcher-impl.js
+++ b/test/unit/utils/test-close-watcher-impl.js
@@ -24,8 +24,7 @@ describes.realWin('#CloseWatcherImpl', {amp: true}, (env) => {
     historyMock.verify();
   });
 
-  // TODO(#40214): fix flaky test.
-  it.skip('should push and pop history state', async () => {
+  it('should push and pop history state', async () => {
     historyMock.expects('push').resolves('H1').once();
     historyMock.expects('pop').withArgs('H1').once();
     const watcher = new CloseWatcherImpl(ampdoc, handler);
@@ -34,8 +33,7 @@ describes.realWin('#CloseWatcherImpl', {amp: true}, (env) => {
     expect(handler).to.be.calledOnce;
   });
 
-  // TODO(#40214): fix flaky test.
-  it.skip('should trigger on history pop', async () => {
+  it('should trigger on history pop', async () => {
     let popHandler;
     historyMock
       .expects('push')
@@ -54,8 +52,7 @@ describes.realWin('#CloseWatcherImpl', {amp: true}, (env) => {
     expect(handler).to.be.calledOnce;
   });
 
-  // TODO(#40214): fix flaky test.
-  it.skip('should trigger on ESC key', async () => {
+  it('should trigger on ESC key', async () => {
     historyMock.expects('push').resolves('H1').once();
     historyMock.expects('pop').withArgs('H1').once();
     new CloseWatcherImpl(ampdoc, handler);

From 88b887ea8b75b2fc32e6ffa0d942f3674e7e23f9 Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Mon, 6 Jan 2025 14:17:41 -0800
Subject: [PATCH 6/8] add back skip

---
 build-system/tasks/e2e/describes-e2e.js       |  1 -
 build-system/tasks/e2e/package-lock.json      | 12 ---
 .../tasks/runtime-test/custom-launchers.js    |  2 -
 .../0.1/test-e2e/test-amp-ad-exit.js          |  6 +-
 .../0.1/test/test-iframe-transport.js         |  3 +-
 .../0.1/test-e2e/test-arrows-non-looping.js   |  9 ++-
 .../test-e2e/test-scrollbound-animation.js    |  3 +-
 .../0.1/test/test-affiliate-link-resolver.js  |  8 +-
 .../test-amp-story-player-navigation.js       |  6 +-
 .../test-amp-story-player-prerender.js        | 10 ++-
 .../test/test-e2e/test-amp-story-player.js    |  3 +-
 .../0.1/test/test-flexible-bitrate.js         |  3 +-
 src/utils/close-watcher-impl.js               |  3 +-
 src/utils/close-watcher.extern.js             |  2 +-
 test/unit/builtins/test-amp-pixel.js          |  2 +-
 test/unit/utils/test-close-watcher-impl.js    | 79 ++++++++++---------
 16 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/build-system/tasks/e2e/describes-e2e.js b/build-system/tasks/e2e/describes-e2e.js
index 7dabae522af2..ce72cfb194d3 100644
--- a/build-system/tasks/e2e/describes-e2e.js
+++ b/build-system/tasks/e2e/describes-e2e.js
@@ -160,7 +160,6 @@ function getChromeArgs(config) {
   const args = [
     '--no-sandbox',
     '--disable-gpu',
-    '--disable-features=StandardCompliantNonSpecialSchemeURLParsing',
     `--window-size=${DEFAULT_E2E_INITIAL_RECT.width},${DEFAULT_E2E_INITIAL_RECT.height}`,
   ];
 
diff --git a/build-system/tasks/e2e/package-lock.json b/build-system/tasks/e2e/package-lock.json
index d09354aad6a0..11d5a4df4dda 100644
--- a/build-system/tasks/e2e/package-lock.json
+++ b/build-system/tasks/e2e/package-lock.json
@@ -719,15 +719,9 @@
       }
     },
     "node_modules/chromedriver": {
-<<<<<<< HEAD
       "version": "131.0.4",
       "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.4.tgz",
       "integrity": "sha512-JgIkept8YrnqT05ldLaOzxxEJDUV1t3PFIIMO/gQz9AbnpZx7Pl1zq6tQTTz2HoY5T2JKZ5kyiEWwc48g4fJ5w==",
-=======
-      "version": "131.0.2",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.2.tgz",
-      "integrity": "sha512-Z3oZmleJP3UEBKCz7XLZoZSbYRnApFmUL4GGmLHxw/NJqcZpEnCNFlwdVKuRlntCPxgdfvYInQCPmZxXyrGE+w==",
->>>>>>> becd73a4d4 (📦 Update dependency chromedriver to v131)
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -2600,15 +2594,9 @@
       }
     },
     "chromedriver": {
-<<<<<<< HEAD
       "version": "131.0.4",
       "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.4.tgz",
       "integrity": "sha512-JgIkept8YrnqT05ldLaOzxxEJDUV1t3PFIIMO/gQz9AbnpZx7Pl1zq6tQTTz2HoY5T2JKZ5kyiEWwc48g4fJ5w==",
-=======
-      "version": "131.0.2",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.2.tgz",
-      "integrity": "sha512-Z3oZmleJP3UEBKCz7XLZoZSbYRnApFmUL4GGmLHxw/NJqcZpEnCNFlwdVKuRlntCPxgdfvYInQCPmZxXyrGE+w==",
->>>>>>> becd73a4d4 (📦 Update dependency chromedriver to v131)
       "dev": true,
       "requires": {
         "@testim/chrome-version": "^1.1.4",
diff --git a/build-system/tasks/runtime-test/custom-launchers.js b/build-system/tasks/runtime-test/custom-launchers.js
index 179fab603435..bd96683d0aa1 100644
--- a/build-system/tasks/runtime-test/custom-launchers.js
+++ b/build-system/tasks/runtime-test/custom-launchers.js
@@ -7,11 +7,9 @@
 const argv = require('minimist')(process.argv.slice(2));
 const {isCiBuild} = require('../../common/ci');
 
-console.log('erwinm running this');
 const DEFAULT_CHROME_FLAGS = [
   // Dramatically speeds up iframe creation.
   '--disable-extensions',
-  '--disable-features=StandardCompliantNonSpecialSchemeURLParsing',
   // Allows simulating user actions (e.g unmute) which will otherwise be denied.
   '--autoplay-policy=no-user-gesture-required',
   // Makes debugging easy by auto-opening devtools.
diff --git a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
index 4fe5f25e2d8a..9e07e9043929 100644
--- a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
@@ -62,7 +62,8 @@ describes.endtoend(
       );
     });
 
-    it('product2 ad opened', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('product2 ad opened', async () => {
       const adDiv = await controller.findElement('#product2');
       await setTime(Number.MAX_VALUE);
       await controller.click(adDiv);
@@ -94,7 +95,8 @@ describes.endtoend(
       );
     });
 
-    it('should open product2 after setting varible target', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should open product2 after setting varible target', async () => {
       const headline = await controller.findElement('h1');
       const nextButton = await controller.findElement('#next-btn');
       await setTime(Number.MAX_VALUE);
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport.js b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
index 2c30d02ec159..5a643777b82d 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
@@ -178,7 +178,8 @@ describes.realWin(
   'amp-analytics.iframe-transport',
   {amp: true, allowExternalResources: true},
   (env) => {
-    it('logs poor performance of vendor iframe', () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('logs poor performance of vendor iframe', () => {
       const body =
         '<html><head><script>' +
         'function busyWait(count, duration, cb) {\n' +
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
index 1e30efe0d6bc..12ec711ea954 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
@@ -31,18 +31,21 @@ describes.endtoend(
       nextArrow = await getNextArrow(controller);
     });
 
-    it('should have the arrows in the correct initial state', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should have the arrows in the correct initial state', async () => {
       await expect(css(prevArrow, 'opacity')).to.equal('0');
       await expect(css(nextArrow, 'opacity')).to.equal('1');
     });
 
-    it('should show the prev arrow when going to the first slide', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should show the prev arrow when going to the first slide', async () => {
       await controller.click(nextArrow);
       await expect(css(prevArrow, 'opacity')).to.equal('1');
       await expect(css(nextArrow, 'opacity')).to.equal('1');
     });
 
-    it('should hide the next arrow when going to the end', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should hide the next arrow when going to the end', async () => {
       const el = await getScrollingElement(controller);
       await controller.scrollTo(el, {left: (SLIDE_COUNT - 1) * pageWidth});
 
diff --git a/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js b/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
index 638f02535e9d..92630d967c10 100644
--- a/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
+++ b/extensions/amp-position-observer/0.1/test-e2e/test-scrollbound-animation.js
@@ -15,7 +15,8 @@ async function testScroll(env) {
     controller = env.controller;
   });
 
-  it('should animate clock hand while scrolling', async () => {
+  // TODO(#40214): fix flaky test.
+  it.skip('should animate clock hand while scrolling', async () => {
     const step = 50;
     const initPoint = {
       'width': 53,
diff --git a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
index 992c466c7cad..12d81ef80e54 100644
--- a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
+++ b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
@@ -12,7 +12,7 @@ import {Waypoint} from '../waypoint';
 
 const DOMAIN_RESOLVER_API_URL = DEFAULT_CONFIG.beaconUrl;
 
-describes.realWin(
+describes.fakeWin(
   'AffiliateLinkResolver',
   {
     amp: {
@@ -107,7 +107,8 @@ describes.realWin(
           resolver.resolveUnknownAnchors(anchorList);
         });
 
-        it('Should only ask for new domains the next times', () => {
+        // TODO(#40214): fix flaky test.
+        it.skip('Should only ask for new domains the next times', () => {
           // Set the domains like if we had already done a call to the API.
           resolver.domains_ = alreadyResolvedDomains;
 
@@ -395,7 +396,8 @@ describes.realWin(
           expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
         });
 
-        it('removes // protocol', () => {
+        // TODO(#40214): fix flaky test.
+        it.skip('removes // protocol', () => {
           const anchor = helpers.createAnchor('//test.com/');
           expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
         });
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
index e35120883354..22dbe661715d 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-navigation.js
@@ -27,7 +27,8 @@ describes.endtoend(
       await expect(player);
     });
 
-    it('first story should be playing video', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('first story should be playing video', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -49,7 +50,8 @@ describes.endtoend(
       await expect(isVideoPaused).to.eql(false);
     });
 
-    it('navigating to next story pauses the previous one', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('navigating to next story pauses the previous one', async () => {
       // Navigate to next story.
       await controller.click(player);
 
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
index 72b0784b0086..1729d64f0d1e 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
@@ -22,7 +22,8 @@ describes.endtoend(
       await expect(player);
     });
 
-    it('when player is not visible in first viewport, it builds the shadow DOM container', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player is not visible in first viewport, it builds the shadow DOM container', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -30,7 +31,8 @@ describes.endtoend(
       await expect(shadowHost);
     });
 
-    it('when player is not visible in first viewport, no stories are loaded or prerendered', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player is not visible in first viewport, no stories are loaded or prerendered', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
@@ -49,7 +51,8 @@ describes.endtoend(
       await expect(count).to.eql(2);
     });
 
-    it('when player becomes visible in viewport, first story starts playing', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('when player becomes visible in viewport, first story starts playing', async () => {
       const doc = await controller.getDocumentElement();
       const playerRect = await controller.getElementRect(player);
 
@@ -72,6 +75,7 @@ describes.endtoend(
       await expect(storyEl).to.exist;
     });
 
+    // TODO(#40214): fix flaky test.
     it('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
       this.timeout(10000);
       const doc = await controller.getDocumentElement();
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js
index e3ca2f483253..874e0aaf5560 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player.js
@@ -22,7 +22,8 @@ describes.endtoend(
       await expect(player);
     });
 
-    it('loads and displays first story on page load when player is visible in viewport', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('loads and displays first story on page load when player is visible in viewport', async () => {
       const shadowHost = await controller.findElement(
         'div.i-amphtml-story-player-shadow-root-intermediary'
       );
diff --git a/extensions/amp-video/0.1/test/test-flexible-bitrate.js b/extensions/amp-video/0.1/test/test-flexible-bitrate.js
index 6137f90ebb73..40cfcf32c007 100644
--- a/extensions/amp-video/0.1/test/test-flexible-bitrate.js
+++ b/extensions/amp-video/0.1/test/test-flexible-bitrate.js
@@ -47,7 +47,8 @@ describes.fakeWin('amp-video flexible-bitrate', {}, (env) => {
       expect(currentBitrates(v0)[0]).to.equal(1000);
     });
 
-    it('should observe lower bandwidth on next sort', () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should observe lower bandwidth on next sort', () => {
       const m = getManager('4g');
       const v0 = getVideo([4000, 1000, 3000, 2000]);
       v0.id = 'v0';
diff --git a/src/utils/close-watcher-impl.js b/src/utils/close-watcher-impl.js
index 75c28298df0d..320f18793daf 100644
--- a/src/utils/close-watcher-impl.js
+++ b/src/utils/close-watcher-impl.js
@@ -71,7 +71,6 @@ export class CloseWatcherImpl {
    */
   requestClose() {
     if (this.watcher_) {
-
       this.watcher_.requestClose();
     } else if (this.handler_) {
       const handler = this.handler_;
@@ -107,7 +106,7 @@ export class CloseWatcherImpl {
   closeOnEscape_(event) {
     if (event.key == Keys_Enum.ESCAPE) {
       event.preventDefault();
-      this.signalClosed();
+      this.requestClose();
     }
   }
 }
diff --git a/src/utils/close-watcher.extern.js b/src/utils/close-watcher.extern.js
index 4a208a563c7c..12ee76aad07f 100644
--- a/src/utils/close-watcher.extern.js
+++ b/src/utils/close-watcher.extern.js
@@ -12,7 +12,7 @@ function CloseWatcher() {}
 
 CloseWatcher.prototype.destroy = function () {};
 
-CloseWatcher.prototype.signalClosed = function () {};
+CloseWatcher.prototype.requestClose = function () {};
 
 /** @type {?function(!Event)} */
 CloseWatcher.prototype.onclose;
diff --git a/test/unit/builtins/test-amp-pixel.js b/test/unit/builtins/test-amp-pixel.js
index de055bf26407..82555673403f 100644
--- a/test/unit/builtins/test-amp-pixel.js
+++ b/test/unit/builtins/test-amp-pixel.js
@@ -141,7 +141,7 @@ describes.realWin('amp-pixel', {amp: true}, (env) => {
     });
   });
 
-  it('should not allow attribution reporting', () => {
+  it.skip('should not allow attribution reporting', () => {
     const attributionSrc =
       '//pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2';
     pixel.setAttribute(
diff --git a/test/unit/utils/test-close-watcher-impl.js b/test/unit/utils/test-close-watcher-impl.js
index 35abefda126d..14e2d7cc1fdd 100644
--- a/test/unit/utils/test-close-watcher-impl.js
+++ b/test/unit/utils/test-close-watcher-impl.js
@@ -24,43 +24,50 @@ describes.realWin('#CloseWatcherImpl', {amp: true}, (env) => {
     historyMock.verify();
   });
 
-  it('should push and pop history state', async () => {
-    historyMock.expects('push').resolves('H1').once();
-    historyMock.expects('pop').withArgs('H1').once();
-    const watcher = new CloseWatcherImpl(ampdoc, handler);
-    await Promise.resolve('H1');
-    watcher.signalClosed();
-    expect(handler).to.be.calledOnce;
-  });
+  // NOTE: Chrome supports the CloseWatcher API so we no longer use the History API.
+  it.configure()
+    .skipChrome()
+    .run('should push and pop history state', async () => {
+      historyMock.expects('push').resolves('H1').once();
+      historyMock.expects('pop').withArgs('H1').once();
+      const watcher = new CloseWatcherImpl(ampdoc, handler);
+      await Promise.resolve('H1');
+      watcher.requestClose();
+      expect(handler).to.be.calledOnce;
+    });
 
-  it('should trigger on history pop', async () => {
-    let popHandler;
-    historyMock
-      .expects('push')
-      .withArgs(
-        env.sandbox.match((a) => {
-          popHandler = a;
-          return true;
-        })
-      )
-      .resolves('H1')
-      .once();
-    new CloseWatcherImpl(ampdoc, handler);
-    await Promise.resolve('H1');
-    expect(popHandler).to.exist;
-    popHandler();
-    expect(handler).to.be.calledOnce;
-  });
+  it.configure()
+    .skipChrome()
+    .run('should trigger on history pop', async () => {
+      let popHandler;
+      historyMock
+        .expects('push')
+        .withArgs(
+          env.sandbox.match((a) => {
+            popHandler = a;
+            return true;
+          })
+        )
+        .resolves('H1')
+        .once();
+      new CloseWatcherImpl(ampdoc, handler);
+      await Promise.resolve('H1');
+      expect(popHandler).to.exist;
+      popHandler();
+      expect(handler).to.be.calledOnce;
+    });
 
-  it('should trigger on ESC key', async () => {
-    historyMock.expects('push').resolves('H1').once();
-    historyMock.expects('pop').withArgs('H1').once();
-    new CloseWatcherImpl(ampdoc, handler);
-    await Promise.resolve('H1');
+  it.configure()
+    .skipChrome()
+    .run('should trigger on ESC key', async () => {
+      historyMock.expects('push').resolves('H1').once();
+      historyMock.expects('pop').withArgs('H1').once();
+      new CloseWatcherImpl(ampdoc, handler);
+      await Promise.resolve('H1');
 
-    doc.documentElement.dispatchEvent(
-      new KeyboardEvent('keydown', {key: Keys_Enum.ESCAPE})
-    );
-    expect(handler).to.be.calledOnce;
-  });
+      doc.documentElement.dispatchEvent(
+        new KeyboardEvent('keydown', {key: Keys_Enum.ESCAPE})
+      );
+      expect(handler).to.be.calledOnce;
+    });
 });

From 627f3b5fb1937d93827ac85931cca53c3b576ae1 Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Mon, 6 Jan 2025 15:51:40 -0800
Subject: [PATCH 7/8] try w/o closewatcher

---
 extensions/amp-lightbox/0.1/test/test-amp-lightbox.js     | 1 -
 extensions/amp-lightbox/test-e2e/test-amp-lightbox.js     | 3 ++-
 .../0.1/test/test-e2e/test-amp-story-player-prerender.js  | 2 +-
 test/unit/builtins/test-amp-pixel.js                      | 1 +
 test/unit/utils/test-close-watcher-impl.js                | 8 ++++++++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
index 41b1f1721d83..0ccafd6c9340 100644
--- a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
@@ -114,7 +114,6 @@ describes.realWin(
       const setupCloseSpy = env.sandbox.spy(impl, 'close');
 
       await impl.open_({caller: sourceElement});
-
       impl.closeWatcher_.requestClose();
       expect(setupCloseSpy).to.be.called;
     });
diff --git a/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js b/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
index ad5fed3df5ac..9a9049d46723 100644
--- a/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
+++ b/extensions/amp-lightbox/test-e2e/test-amp-lightbox.js
@@ -58,7 +58,8 @@ describes.endtoend(
       ).to.equal(641);
     });
 
-    it('should close the lightbox', async () => {
+    // TODO(#40214): fix flaky test.
+    it.skip('should close the lightbox', async () => {
       const open = await controller.findElement('#open');
       await controller.click(open);
 
diff --git a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
index 1729d64f0d1e..8c143f3f0a97 100644
--- a/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
+++ b/extensions/amp-story-player/0.1/test/test-e2e/test-amp-story-player-prerender.js
@@ -76,7 +76,7 @@ describes.endtoend(
     });
 
     // TODO(#40214): fix flaky test.
-    it('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
+    it.skip('when player becomes visible in viewport and first story finishes loading, second story starts preloading', async function () {
       this.timeout(10000);
       const doc = await controller.getDocumentElement();
       const playerRect = await controller.getElementRect(player);
diff --git a/test/unit/builtins/test-amp-pixel.js b/test/unit/builtins/test-amp-pixel.js
index 82555673403f..4e718a2f1a3c 100644
--- a/test/unit/builtins/test-amp-pixel.js
+++ b/test/unit/builtins/test-amp-pixel.js
@@ -141,6 +141,7 @@ describes.realWin('amp-pixel', {amp: true}, (env) => {
     });
   });
 
+  // TODO(#40214): fix flaky test.
   it.skip('should not allow attribution reporting', () => {
     const attributionSrc =
       '//pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2';
diff --git a/test/unit/utils/test-close-watcher-impl.js b/test/unit/utils/test-close-watcher-impl.js
index 14e2d7cc1fdd..cd47f0a94cb0 100644
--- a/test/unit/utils/test-close-watcher-impl.js
+++ b/test/unit/utils/test-close-watcher-impl.js
@@ -24,6 +24,14 @@ describes.realWin('#CloseWatcherImpl', {amp: true}, (env) => {
     historyMock.verify();
   });
 
+  it.configure()
+    .ifChrome()
+    .run('should call the handler on requestClose', async () => {
+      const watcher = new CloseWatcherImpl(ampdoc, handler);
+      watcher.requestClose();
+      expect(handler).to.be.calledOnce;
+    });
+
   // NOTE: Chrome supports the CloseWatcher API so we no longer use the History API.
   it.configure()
     .skipChrome()

From f1882118b3a1e06036b7dc077d8f7cd7c747e824 Mon Sep 17 00:00:00 2001
From: Erwin Mombay <erwinm@google.com>
Date: Tue, 7 Jan 2025 10:14:18 -0800
Subject: [PATCH 8/8] fix more tests

---
 extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
index 9e07e9043929..a21223ffebe9 100644
--- a/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/test-e2e/test-amp-ad-exit.js
@@ -63,7 +63,7 @@ describes.endtoend(
     });
 
     // TODO(#40214): fix flaky test.
-    it.skip('product2 ad opened', async () => {
+    it('product2 ad opened', async () => {
       const adDiv = await controller.findElement('#product2');
       await setTime(Number.MAX_VALUE);
       await controller.click(adDiv);