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

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.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/CookieManagerTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.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/GeolocationTest.java

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

index efc827f29567e556669eaa4209a5830dc1e60bbe..54e07e369bb6dda25842a8353dbb16fd7f15e7b9 100644

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

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

@@ -107,7 +107,7 @@ public class GeolocationTest extends AwTestBase {

}

private void ensureGeolocationRunning(final boolean running) throws Exception {

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return mMockLocationProvider.isRunning() == running;

@@ -128,7 +128,7 @@ public class GeolocationTest extends AwTestBase {

mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return getPositionCountFromJS() == 1;

@@ -136,7 +136,7 @@ public class GeolocationTest extends AwTestBase {

});

mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return getPositionCountFromJS() == 2;

@@ -156,7 +156,7 @@ public class GeolocationTest extends AwTestBase {

mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return getPositionCountFromJS() > 1;

@@ -174,7 +174,7 @@ public class GeolocationTest extends AwTestBase {

mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return getPositionCountFromJS() > 1;

@@ -208,7 +208,7 @@ public class GeolocationTest extends AwTestBase {

ensureGeolocationRunning(true);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return getPositionCountFromJS() > 1;

@@ -246,7 +246,7 @@ public class GeolocationTest extends AwTestBase {

ensureGeolocationRunning(true);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

return getPositionCountFromJS() > 1;

@@ -287,7 +287,7 @@ public class GeolocationTest extends AwTestBase {

mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);

- poll(new Callable<Boolean>() {

+ pollInstrumentationThread(new Callable<Boolean>() {

@SuppressFBWarnings("DM_GC")

@Override

public Boolean call() throws Exception {