Commit 25594874 authored by Donn Denman's avatar Donn Denman Committed by Commit Bot

Fix compile problem in GwsIntegrationTest.

Fixes a problem due to a change in ChromeTabUtils#waitForTabPageLoaded
no longer supporting the signature used in this test.

This CL adds that signature back as another supported configuration for
ChromeTabUtils#waitForTabPageLoaded.

Troublesome CL: https://chromium-review.googlesource.com/c/chromium/src/+/1318893

TBR=tedchoc@chromium.org

BUG=906700

Change-Id: Iae2640c4eb6e45d3f1da57691904fbd91e030785
Reviewed-on: https://chromium-review.googlesource.com/c/1343287Reviewed-by: default avatarDonn Denman <donnd@chromium.org>
Commit-Queue: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609455}
parent 813e1d54
...@@ -140,6 +140,19 @@ public class ChromeTabUtils { ...@@ -140,6 +140,19 @@ public class ChromeTabUtils {
waitForTabPageLoaded(tab, url, loadTrigger, CallbackHelper.WAIT_TIMEOUT_SECONDS); waitForTabPageLoaded(tab, url, loadTrigger, CallbackHelper.WAIT_TIMEOUT_SECONDS);
} }
/**
* Waits for the given tab to finish loading its current page.
*
* @param tab The tab to wait for the page loading to be complete.
* @param loadTrigger The trigger action that will result in a page load finished event
* to be fired (not run on the UI thread by default).
* @param secondsToWait The number of seconds to wait for the page to be loaded.
*/
public static void waitForTabPageLoaded(final Tab tab, Runnable loadTrigger, long secondsToWait)
throws InterruptedException {
waitForTabPageLoaded(tab, null, loadTrigger, secondsToWait);
}
/** /**
* Waits for the given tab to load the given URL, or, if the given URL is null, waits * Waits for the given tab to load the given URL, or, if the given URL is null, waits
* for the triggered load to complete. * for the triggered load to complete.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment