Fix setComposingText when newCursorPosition != 1

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 75809c5eed25af2fe6f5d46f93d4f5d330b78796..354b558aea9b3e356773870b00fc6a0241a6d489 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
@@ -153,6 +153,56 @@ public class ImeTest extends ContentShellTestBase {
 
     @SmallTest
     @Feature({"TextInput", "Main"})
+    public void testSetComposingTextForDifferentnewCursorPositions() throws Throwable {
+        // When newCursorPosition != 1, setComposingText doesn't work for ReplicaInputConnection
+        // because there is a bug in BaseInputConnection.
+        if (!usingReplicaInputConnection()) {
+            // Cursor is on the right of composing text when newCursorPosition > 0.
+            setComposingText("ab", 1);
+            waitAndVerifyUpdateSelection(0, 2, 2, 0, 2);
+
+            finishComposingText();
+            waitAndVerifyUpdateSelection(1, 2, 2, -1, -1);
+
+            // Cursor exceeds the left boundary.
+            setComposingText("cdef", -100);
+            waitAndVerifyUpdateSelection(2, 0, 0, 2, 6);
+
+            // Cursor is on the left boundary.
+            setComposingText("cd", -2);
+            waitAndVerifyUpdateSelection(3, 0, 0, 2, 4);
+
+            // Cursor is between the left boundary and the composing text.
+            setComposingText("cd", -1);
+            waitAndVerifyUpdateSelection(4, 1, 1, 2, 4);
+
+            // Cursor is on the left of composing text.
+            setComposingText("cd", 0);
+            waitAndVerifyUpdateSelection(5, 2, 2, 2, 4);
+
+            finishComposingText();
+            waitAndVerifyUpdateSelection(6, 2, 2, -1, -1);
+
+            // Cursor is on the right of composing text.
+            setComposingText("ef", 1);
+            waitAndVerifyUpdateSelection(7, 4, 4, 2, 4);
+
+            // Cursor is between the composing text and the right boundary.
+            setComposingText("ef", 2);
+            waitAndVerifyUpdateSelection(8, 5, 5, 2, 4);
+
+            // Cursor is on the right boundary.
+            setComposingText("ef", 3);
+            waitAndVerifyUpdateSelection(9, 6, 6, 2, 4);
+
+            // Cursor exceeds the right boundary.
+            setComposingText("efgh", 100);
+            waitAndVerifyUpdateSelection(10, 8, 8, 2, 6);
+        }
+    }
+
+    @SmallTest
+    @Feature({"TextInput", "Main"})
     public void testCommitWhileComposingText() throws Throwable {
         setComposingText("h", 1);
         waitAndVerifyUpdateSelection(0, 1, 1, 0, 1);