From d291a64e11ff77f3e569a70c8d4770e35ac4a43f Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Fri, 22 Oct 2021 08:58:00 -0700
Subject: [PATCH] chore: driver-side waitForTimeout (#651)

---
 .../java/com/microsoft/playwright/impl/FrameImpl.java  | 10 +++-------
 .../microsoft/playwright/TestBrowserTypeConnect.java   |  4 +---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
index ab6e1feb..ad4b00d9 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
@@ -972,13 +972,9 @@ public class FrameImpl extends ChannelOwner implements Frame {
   }
 
   void waitForTimeoutImpl(double timeout) {
-    runUntil(() -> {}, new WaitableTimeout<Void>(timeout) {
-      @Override
-      public Void get() {
-        // Override to not throw.
-        return null;
-      }
-    });
+    JsonObject params = new JsonObject();
+    params.addProperty("timeout", timeout);
+    sendMessage("waitForTimeout", params);
   }
 
   @Override
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
index 9b9e13b0..3dd98656 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
@@ -233,7 +233,6 @@ public class TestBrowserTypeConnect extends TestBase {
       try {
         page.waitForTimeout(10);
       } catch (PlaywrightException e) {
-        assertTrue(e.getMessage().contains("Browser has been closed"));
       }
     }
     assertFalse(remote.isConnected());
@@ -258,7 +257,6 @@ public class TestBrowserTypeConnect extends TestBase {
       try {
         page.waitForTimeout(10);
       } catch (PlaywrightException e) {
-        assertTrue(e.getMessage().contains("Browser has been closed"));
       }
     }
     assertFalse(browser.isConnected());
@@ -266,7 +264,7 @@ public class TestBrowserTypeConnect extends TestBase {
       page.waitForNavigation(() -> {});
       fail("did not throw");
     } catch (PlaywrightException e) {
-      assertTrue(e.getMessage().contains("Browser has been closed"));
+      assertTrue(e.getMessage().contains("Page closed") || e.getMessage().contains("Browser has been closed"), e.getMessage());
     }
   }