diff options
| author | ajith.v <ajith.v@chromium.org> | 2015-10-20 05:29:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 12:30:45 +0000 |
| commit | ac65234484a68377a11dddd83eda5d5031b692ce (patch) | |
| tree | e6db112e636f8b69eb7e3e3450d6cca61df9407c /android_webview | |
| parent | 34f0e234ed1d2f29ea8fa6ad62e46af592467a91 (diff) | |
| download | chromium_src-ac65234484a68377a11dddd83eda5d5031b692ce.zip chromium_src-ac65234484a68377a11dddd83eda5d5031b692ce.tar.gz chromium_src-ac65234484a68377a11dddd83eda5d5031b692ce.tar.bz2 | |
Removing Atomic Boolean from Test files.
This change takes care of removing Atomic Boolean
types from few test files by using CriteriaHelper.
BUG=
Review URL: https://codereview.chromium.org/1406553002
Cr-Commit-Position: refs/heads/master@{#355046}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java index 4c5d5df..d917c22 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java @@ -14,6 +14,7 @@ import org.chromium.android_webview.AwScrollOffsetManager; import org.chromium.android_webview.test.util.AwTestTouchUtils; import org.chromium.android_webview.test.util.CommonResources; import org.chromium.android_webview.test.util.JavascriptEventObserver; +import org.chromium.base.ThreadUtils; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.MinAndroidSdkLevel; @@ -205,15 +206,13 @@ public class AndroidScrollIntegrationTest extends AwTestBase { private boolean checkScrollOnMainSync(final ScrollTestContainerView testContainerView, final int scrollXPix, final int scrollYPix) { - final AtomicBoolean equal = new AtomicBoolean(false); - getInstrumentation().runOnMainSync(new Runnable() { + return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Boolean>() { @Override - public void run() { - equal.set((scrollXPix == testContainerView.getScrollX()) - && (scrollYPix == testContainerView.getScrollY())); + public Boolean call() { + return scrollXPix == testContainerView.getScrollX() + && scrollYPix == testContainerView.getScrollY(); } }); - return equal.get(); } private void assertScrollOnMainSync(final ScrollTestContainerView testContainerView, |