Send correct key-codes when doing composition events instead of always 0.

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 90e970cf045df5c5f2d636979d45e8b767bec014..f194667d718c9b78ddec125e978f90dfa3f75763 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
@@ -264,6 +264,34 @@ public class ImeTest extends ContentShellTestBase {
 
     @SmallTest
     @Feature({"TextInput", "Main"})
+    public void testKeyCodesWhileComposingText() throws Throwable {
+        DOMUtils.focusNode(mContentViewCore, "input_radio");
+        assertWaitForKeyboardStatus(false);
+        DOMUtils.focusNode(mContentViewCore, "textarea");
+        assertWaitForKeyboardStatus(true);
+
+        mConnection = (TestAdapterInputConnection) getAdapterInputConnection();
+        waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 0, "", 0, 0, -1, -1);
+
+        setComposingText(mConnection, "h", 1);
+        waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 1, "h", 1, 1, 0, 1);
+        assertEquals(KeyEvent.KEYCODE_H, mImeAdapter.mLastComposeKeyCode);
+
+        setComposingText(mConnection, "ho", 1);
+        waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 2, "ho", 2, 2, 0, 2);
+        assertEquals(KeyEvent.KEYCODE_O, mImeAdapter.mLastComposeKeyCode);
+
+        setComposingText(mConnection, "h", 1);
+        waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 3, "h", 1, 1, 0, 1);
+        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastComposeKeyCode);
+
+        setComposingText(mConnection, "hi", 1);
+        waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 4, "hi", 2, 2, 0, 2);
+        assertEquals(KeyEvent.KEYCODE_I, mImeAdapter.mLastComposeKeyCode);
+    }
+
+    @SmallTest
+    @Feature({"TextInput", "Main"})
     public void testEnterKeyEventWhileComposingText() throws Throwable {
         DOMUtils.focusNode(mContentViewCore, "input_radio");
         assertWaitForKeyboardStatus(false);