| Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| index 561a2d967cce810899fa1b1e553fb6777ec9f9e2..8f4baa4cc1efd51218ff9e693c3cdf6a1ae71f47 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| @@ -22,6 +22,7 @@ import android.view.inputmethod.EditorInfo;
|
| import android.view.inputmethod.InputConnection;
|
|
|
| import org.chromium.base.ThreadUtils;
|
| +import org.chromium.base.annotations.SuppressFBWarnings;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.UrlUtils;
|
| import org.chromium.content.browser.ContentViewCore;
|
| @@ -1763,12 +1764,28 @@ public class ImeTest extends ContentShellTestBase {
|
| mFactory = factory;
|
| }
|
|
|
| + private static ThreadLocal<Boolean> sTriggerDelayedOnCreateInputConnection =
|
| + new ThreadLocal<Boolean>() {
|
| + @SuppressFBWarnings("CHROMIUM_SYNCHRONIZED_METHOD")
|
| + @Override
|
| + protected synchronized Boolean initialValue() {
|
| + return true;
|
| + }
|
| + };
|
| +
|
| + @Override
|
| + public void setTriggerDelayedOnCreateInputConnection(final boolean trigger) {
|
| + sTriggerDelayedOnCreateInputConnection.set(trigger);
|
| + }
|
| +
|
| @Override
|
| public ChromiumBaseInputConnection initializeAndGet(View view, ImeAdapter imeAdapter,
|
| int inputType, int inputFlags, int inputMode, int selectionStart, int selectionEnd,
|
| EditorInfo outAttrs) {
|
| mTextInputTypeList.add(inputType);
|
| mOutAttrs = outAttrs;
|
| + mFactory.setTriggerDelayedOnCreateInputConnection(
|
| + sTriggerDelayedOnCreateInputConnection.get());
|
| return mFactory.initializeAndGet(view, imeAdapter, inputType, inputMode, inputFlags,
|
| selectionStart, selectionEnd, outAttrs);
|
| }
|
|
|