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

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

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/src/utils/close-watcher-impl.js b/src/utils/close-watcher-impl.js
index 320f18793daf..6cbeb591f4ae 100644
--- a/src/utils/close-watcher-impl.js
+++ b/src/utils/close-watcher-impl.js
@@ -8,9 +8,9 @@ import {Keys_Enum} from '#core/constants/key-codes';
 
 import {Services} from '#service';
 
-import {dev, devAssert} from '#utils/log';
+import {devAssert} from '#utils/log';
 
-const TAG = 'CloseWatcherImpl';
+//const TAG = 'CloseWatcherImpl';
 
 export class CloseWatcherImpl {
   /**
@@ -37,7 +37,7 @@ export class CloseWatcherImpl {
 
     /** @private {?function()} */
     this.boundCloseOnEscape_ = null;
-
+    
     if (typeof win.CloseWatcher === 'function') {
       try {
         this.watcher_ = new win.CloseWatcher();
diff --git a/test/unit/utils/test-close-watcher-impl.js b/test/unit/utils/test-close-watcher-impl.js
index 14e2d7cc1fdd..c4b9581a0c57 100644
--- a/test/unit/utils/test-close-watcher-impl.js
+++ b/test/unit/utils/test-close-watcher-impl.js
@@ -24,6 +24,12 @@ 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()