android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java - Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and update MediaRouterIntegrationTest.java Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

index c865f4b043f1aed8287e65586ebacb4b3ace5c0e..054d06ce08e9c1861732782fcf2b32c57393f886 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

@@ -216,7 +216,8 @@ public class AwContentsGarbageCollectionTest extends AwTestBase {

final long timeoutBetweenGcMs = scaleTimeout(1000);

for (int i = 0; i < 15; ++i) {

try {

- CriteriaHelper.pollForCriteria(criteria, timeoutBetweenGcMs, CHECK_INTERVAL);

+ CriteriaHelper.pollInstrumentationThread(

+ criteria, timeoutBetweenGcMs, CHECK_INTERVAL);

break;

} catch (AssertionError e) {

Runtime.getRuntime().gc();