Introduce ThreadedInputConnection behind a switch

content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
index 5243610edf36b95bda3179316f7d0eb992c49462..56df44cc10411af94e7f1881d9c5ba309cae459c 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreInputConnectionTest.java
@@ -7,10 +7,12 @@ package org.chromium.content.browser;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.inputmethod.EditorInfo;
 
-import org.chromium.content.browser.input.AdapterInputConnection;
+import org.chromium.base.CommandLine;
+import org.chromium.content.browser.input.ChromiumBaseInputConnection;
 import org.chromium.content.browser.input.ImeAdapter;
 import org.chromium.content.browser.input.InputMethodManagerWrapper;
 import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper;
+import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 
 /**
@@ -51,10 +53,14 @@ public class ContentViewCoreInputConnectionTest extends ContentShellTestBase {
     @SmallTest
     @RerunWithUpdatedContainerView
     public void testRecreateInputConnection() throws Exception {
+        // TODO(changwan): add a new test to ImeTest.java that does something similar.
+        // We don't have Editable in the new model.
+        if (CommandLine.getInstance().hasSwitch(ContentSwitches.USE_IME_THREAD)) return;
+
         EditorInfo info = new EditorInfo();
 
         mContentViewCore.onCreateInputConnection(info);
-        AdapterInputConnection adapter = mContentViewCore.getAdapterInputConnectionForTest();
+        ChromiumBaseInputConnection adapter = mContentViewCore.getInputConnectionForTest();
         adapter.updateState("Is this text restored?", 0, 0, 0, 0, true);
 
         String text = mContentViewCore.getEditableForTest().toString();