Introduce ThreadedInputConnection behind a switch

content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

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 16cdee6ad6311fe2e01551b705ec5a70ddc8194d..61c3d733ea5a3fee0160ddb21f10944a1e38292e 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
@@ -73,8 +73,7 @@ public class ImeTest extends ContentShellTestBase {
         mInputMethodManagerWrapper = new TestInputMethodManagerWrapper(mContentViewCore);
         getImeAdapter().setInputMethodManagerWrapper(mInputMethodManagerWrapper);
         assertEquals(0, mInputMethodManagerWrapper.getShowSoftInputCounter());
-        mContentViewCore.setAdapterInputConnectionFactory(
-                new TestAdapterInputConnectionFactory());
+        mContentViewCore.setInputConnectionFactory(new TestAdapterInputConnectionFactory());
 
         mCallbackContainer = new TestCallbackHelperContainer(mContentViewCore);
         // TODO(aurimas) remove this wait once crbug.com/179511 is fixed.
@@ -84,7 +83,7 @@ public class ImeTest extends ContentShellTestBase {
         DOMUtils.clickNode(this, mContentViewCore, "input_text");
         assertWaitForKeyboardStatus(true);
 
-        mConnection = (TestAdapterInputConnection) getAdapterInputConnection();
+        mConnection = (TestAdapterInputConnection) getInputConnection();
         mImeAdapter = getImeAdapter();
 
         waitAndVerifyStatesAndCalls(0, "", 0, 0, -1, -1);
@@ -1045,7 +1044,7 @@ public class ImeTest extends ContentShellTestBase {
             @Override
             public boolean isSatisfied() {
                 return show == getImeAdapter().mIsShowWithoutHideOutstanding
-                        && (!show || getAdapterInputConnection() != null);
+                        && (!show || getInputConnection() != null);
             }
         }));
     }
@@ -1131,7 +1130,7 @@ public class ImeTest extends ContentShellTestBase {
         return mContentViewCore.getImeAdapterForTest();
     }
 
-    private AdapterInputConnection getAdapterInputConnection() {
+    private ChromiumBaseInputConnection getInputConnection() {
         return mContentViewCore.getInputConnectionForTest();
     }
 
@@ -1268,7 +1267,7 @@ public class ImeTest extends ContentShellTestBase {
             }
         }));
         // When we focus another element, the connection may be recreated.
-        mConnection = (TestAdapterInputConnection) getAdapterInputConnection();
+        mConnection = (TestAdapterInputConnection) getInputConnection();
         waitAndVerifyStatesAndCalls(0, "", 0, 0, -1, -1);
     }
 
@@ -1281,11 +1280,11 @@ public class ImeTest extends ContentShellTestBase {
         });
     }
 
-    private static class TestAdapterInputConnectionFactory extends
-            ImeAdapter.AdapterInputConnectionFactory {
+    private static class TestAdapterInputConnectionFactory
+            extends ChromiumBaseInputConnectionFactory {
         @Override
-        public AdapterInputConnection get(View view, ImeAdapter imeAdapter,
-                Editable editable, EditorInfo outAttrs) {
+        public ChromiumBaseInputConnection get(
+                View view, ImeAdapter imeAdapter, Editable editable, EditorInfo outAttrs) {
             return new TestAdapterInputConnection(view, imeAdapter, editable, outAttrs);
         }
     }