Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java |
index 573f0d9679d8dd9b63b30d5e6d6746bf927f4383..18f92bab92ce24db13c25fb72c5a2d62d97d1b99 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java |
@@ -9,6 +9,7 @@ import android.text.TextUtils; |
import android.view.View; |
import android.view.ViewGroup; |
+import org.chromium.base.CommandLine; |
import org.chromium.base.ThreadUtils; |
import org.chromium.base.test.util.Feature; |
import org.chromium.base.test.util.UrlUtils; |
@@ -22,6 +23,7 @@ import org.chromium.content.browser.test.util.CriteriaHelper; |
import org.chromium.content.browser.test.util.DOMUtils; |
import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper; |
import org.chromium.content.browser.test.util.TouchCommon; |
+import org.chromium.content.common.ContentSwitches; |
import org.chromium.content_public.browser.WebContents; |
import org.chromium.ui.autofill.AutofillPopup; |
@@ -173,13 +175,16 @@ public class AutofillPopupTest extends ChromeActivityTestCaseBase<ChromeActivity |
waitForKeyboardShowRequest(immw, 1); |
- ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
- @Override |
- public void run() { |
- viewCore.getInputConnectionForTest().setComposingText( |
- inputText, 1); |
- } |
- }); |
+ if (CommandLine.getInstance().hasSwitch(ContentSwitches.USE_IME_THREAD)) { |
aelias_OOO_until_Jul13
2015/09/30 00:10:03
We shouldn't be checking for a command-line switch
Changwan Ryu
2016/01/19 07:31:52
Done.
|
+ viewCore.getInputConnectionForTest().setComposingText(inputText, 1); |
+ } else { |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ viewCore.getInputConnectionForTest().setComposingText(inputText, 1); |
+ } |
+ }); |
+ } |
waitForAnchorViewAdd(view); |
View anchorView = view.findViewById(R.id.dropdown_popup_window); |