| Index: content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
|
| index 6c9e0b98bc545f45924adb307c252f07e4d6c3b3..0ad52b44623a7d9524254ebc374c2d3b03e3d216 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
|
| @@ -21,6 +21,9 @@ import org.chromium.content_shell_apk.ContentShellTestBase;
|
|
|
| import java.util.concurrent.Callable;
|
|
|
| +/**
|
| + * Tests rich text clipboard functionality.
|
| + */
|
| public class ClipboardTest extends ContentShellTestBase {
|
| private static final String TEST_PAGE_DATA_URL = UrlUtils.encodeHtmlDataUri(
|
| "<html><body>Hello, <a href=\"http://www.example.com/\">world</a>, how <b> " +
|
| @@ -50,8 +53,9 @@ public class ClipboardTest extends ContentShellTestBase {
|
| clipboardManager.setPrimaryClip(ClipData.newPlainText(null, ""));
|
| assertFalse(hasPrimaryClip(clipboardManager));
|
|
|
| - getImeAdapter().selectAll();
|
| - getImeAdapter().copy();
|
| + ImeAdapter adapter = getContentViewCore().getImeAdapterForTest();
|
| + selectAll(adapter);
|
| + copy(adapter);
|
|
|
| // Waits until data has been made available on the Android clipboard.
|
| assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
|
| @@ -80,8 +84,22 @@ public class ClipboardTest extends ContentShellTestBase {
|
| }
|
| }
|
|
|
| - private ImeAdapter getImeAdapter() {
|
| - return getContentViewCore().getImeAdapterForTest();
|
| + private void copy(final ImeAdapter adapter) {
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + adapter.copy();
|
| + }
|
| + });
|
| + }
|
| +
|
| + private void selectAll(final ImeAdapter adapter) {
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + adapter.selectAll();
|
| + }
|
| + });
|
| }
|
|
|
| // Returns whether there is a primary clip with content on the current clipboard.
|
|
|
Chromium Code Reviews
Issue 191133003:
In tests call ImeAdapter from UI thread only. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src